プロジェクト

全般

プロフィール

リビジョン 306

堀内約7年前に追加

請求完了を請求確認へ変更
申請・承認時コメント編集機能追加
掲示板表示確認処理の変更
工事情報検査予定日位置変更

差分を表示:

branches/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs
442 442
            /// </summary>
443 443
            Status9,
444 444
            /// <summary>
445
            /// 請求完了
445
            /// 請求確認
446 446
            /// </summary>
447 447
            Status10,
448 448
            /// <summary>
......
568 568
                                                                                {7, "施工開始"},            // 工事基本情報ラジオボタン:6
569 569
                                                                                {8, "施工完了"},            // 工事基本情報ラジオボタン:7
570 570
                                                                                {9, "請求準備"},            // 工事基本情報ラジオボタン:9
571
                                                                                {10, "請求完了"},           // 工事基本情報ラジオボタン:10
571
                                                                                {10, "請求確認"},           // 工事基本情報ラジオボタン:10
572 572
                                                                                {11, "非 受 注"},           // 工事基本情報ラジオボタン:3
573 573
                                                                                {12, "総務入金確認"},       // 工事基本情報ラジオボタン:12
574 574
                                                                                {13, "担当者入金確認完了"}, // 工事基本情報ラジオボタン:13
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
14 14
        /// <summary>
15 15
        /// 本体バージョン
16 16
        /// </summary>
17
        public static int s_SystemVersion = 120;
17
        public static int s_SystemVersion = 122;
18 18

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsMessageBoradAccess.cs
155 155
            try
156 156
            {
157 157
                bool MacthFlg = false;
158

  
158 159
                // 新セキュリティデータ対応済みかを確認する
159
                if (CommonMotions.LoginUserData.SecCode == 0)
160
                // 編集・書込み時のチェック
161
                if (MessageNewEditPermission(RecoadNo, BuranchNo)) return true;
162

  
163
                // 読込み時のチェック
164
                if (bRead)
160 165
                {
161
                    MacthFlg = MessageOldPermission(RecoadNo, BuranchNo, bRead);
166
                    MacthFlg = MessageNewReadPermission(RecoadNo, BuranchNo);
162 167
                }
163
                else
164
                {
165
                    // 編集・書込み時のチェック
166
                    MacthFlg = MessageNewEditPermission(RecoadNo, BuranchNo);
167
                    // 読込み時のチェック
168
                    if (bRead)
169
                    {
170
                        MacthFlg = MessageNewReadPermission(RecoadNo, BuranchNo);
171
                    }
172
                }
173 168

  
174 169
                return MacthFlg;
175 170
            }
......
181 176
        }
182 177
        #endregion
183 178

  
184
        #region 掲示板読込・編集権限確認(新タイプ対応)
179
        #region 掲示板編集権限確認
185 180
        /// <summary>
186
        /// 掲示板編集権限確認(新タイプ対応)
181
        /// 掲示板編集権限確認
187 182
        /// </summary>
188 183
        public static bool MessageNewEditPermission(int RecoadNo, int BuranchNo)
189 184
        {
......
192 187
            try
193 188
            {
194 189
                // 対象データの取得
195
                string strSQL = "SELECT A.*, B.*, C.* FROM MESSAGEBOARDDATA A";
196
                strSQL += " LEFT JOIN PERSONINCHARGEMASTER B ON B.PERSONCODE = A.FROMCODE";
197
                strSQL += " LEFT JOIN SECURITYMASTER C ON C.SECCODE = B.SECCODE";
198
                strSQL += string.Format(" WHERE A.RECORDNUMBER = {0} AND A.BRANCHNUMBER = {1}", RecoadNo, BuranchNo);
190
                StringBuilder strSQL = new StringBuilder();
191
                strSQL.Append("SELECT");
192
                strSQL.Append(" A.*, B.*, C.*");
193
                strSQL.Append(" FROM");
194
                strSQL.Append(" MESSAGEBOARDDATA A");
195
                strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER B");
196
                strSQL.Append("    ON B.PERSONCODE = A.FROMCODE");
197
                strSQL.Append(" LEFT JOIN SECURITYMASTER C");
198
                strSQL.Append("    ON C.SECCODE = B.SECCODE");
199
                strSQL.Append(" WHERE");
200
                strSQL.AppendFormat(" A.RECORDNUMBER = {0}", RecoadNo);
201
                strSQL.AppendFormat(" AND A.BRANCHNUMBER = {0}", BuranchNo);
199 202

  
200 203
                ArrayList mbdRec = new ArrayList();
201
                if (!mbdDB.ExecuteReader(strSQL, ref mbdRec)) return false;
204
                if (!mbdDB.ExecuteReader(strSQL.ToString(), ref mbdRec)) return false;
202 205
                object[] objRec = (object[])mbdRec[0];
203 206

  
204 207
                int PersonBaseBoardDataCnt = Enum.GetNames(typeof(IOMessageBoardData.ColumnCnt)).Length;
......
247 250
                        depcode = FromCode;
248 251

  
249 252
                        // 部署のMAXのセキュリティ区分を取得する
250
                        string strSECSQL = "SELECT MAX(B.SECRANK) FROM PERSONINCHARGEMASTER A, SECURITYMASTER B";
251
                        strSECSQL += string.Format(" WHERE DEPARTMENTCODE = {0} AND B.SECCODE = A.SECCODE", FromCode);
253
                        StringBuilder strSECSQL = new StringBuilder();
254
                        strSECSQL.Append("SELECT");
255
                        strSECSQL.Append(" MAX(B.SECRANK)");
256
                        strSECSQL.Append(" FROM");
257
                        strSECSQL.Append(" PERSONINCHARGEMASTER A");
258
                        strSECSQL.Append(", SECURITYMASTER B");
259
                        strSECSQL.Append(" WHERE");
260
                        strSECSQL.AppendFormat(" DEPARTMENTCODE = {0}", FromCode);
261
                        strSECSQL.Append(" AND B.SECCODE = A.SECCODE"); 
262

  
252 263
                        ArrayList SecarList = new ArrayList();
253
                        secDB.ExecuteReader(strSECSQL, ref SecarList);
264
                        secDB.ExecuteReader(strSECSQL.ToString(), ref SecarList);
254 265
                        object[] objSecRec = (object[])SecarList[0];
255 266
                        int OfficeSec = CommonMotions.cnvInt(objSecRec[0]);
256 267
                        if (OfficeSec != 0)
......
298 309
        }
299 310
        #endregion
300 311

  
301
        #region 掲示板可読権限確認(新タイプ対応)
312
        #region 掲示板可読権限確認
302 313
        /// <summary>
303
        /// 掲示板可読権限確認(新タイプ対応)
314
        /// 掲示板可読権限確認
304 315
        /// </summary>
305 316
        /// <param name="RecoadNo">レコード番号</param>
306 317
        /// <param name="BuranchNo">レコード枝番</param>
......
331 342
                else
332 343
                {
333 344
                    // 掲示板閲覧テーブルのチェック
334
                    string strSQL = "SELECT";
335
                    strSQL += " A.RecordNumber";
336
                    strSQL += ", A.BranchNumber";
337
                    strSQL += ", A.SeqNum";
338
                    strSQL += ", A.ToCode";
339
                    strSQL += ", A.ToName";
340
                    strSQL += ", DATE_FORMAT(A.EntryDate, '%Y/%m/%d %H:%i:%s')";
341
                    strSQL += ", DATE_FORMAT(A.UpdateDate, '%Y/%m/%d %H:%i:%s')";
342
                    strSQL += " , B.SHAREFLAG, C.DEPARTMENTCODE, D.SECRANK FROM MESSAGEBOARDTERGET A";
343
                    strSQL += " LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = A.TOCODE";
344
                    strSQL += " LEFT JOIN SECURITYMASTER D ON D.SECCODE = C.SECCODE";
345
                    strSQL += " , MESSAGEBOARDDATA B";
346
                    strSQL += string.Format(" WHERE A.RECORDNUMBER = {0} AND A.BRANCHNUMBER = {1}", RecoadNo, BuranchNo);
347
                    strSQL += " AND B.RECORDNUMBER = A.RECORDNUMBER";
348
                    strSQL += " AND B.BRANCHNUMBER = A.BRANCHNUMBER";
345
                    StringBuilder strSQL = new StringBuilder();
346
                    strSQL.Append("SELECT");
347
                    strSQL.Append(" A.RecordNumber");
348
                    strSQL.Append(", A.BranchNumber");
349
                    strSQL.Append(", A.SeqNum");
350
                    strSQL.Append(", A.ToCode");
351
                    strSQL.Append(", A.ToName");
352
                    strSQL.Append(", DATE_FORMAT(A.EntryDate, '%Y/%m/%d %H:%i:%s')");
353
                    strSQL.Append(", DATE_FORMAT(A.UpdateDate, '%Y/%m/%d %H:%i:%s')");
354
                    strSQL.Append(" , B.SHAREFLAG, C.DEPARTMENTCODE, D.SECRANK FROM MESSAGEBOARDTERGET A");
355
                    strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = A.TOCODE");
356
                    strSQL.Append(" LEFT JOIN SECURITYMASTER D ON D.SECCODE = C.SECCODE");
357
                    strSQL.Append(" , MESSAGEBOARDDATA B");
358
                    strSQL.AppendFormat(" WHERE A.RECORDNUMBER = {0}", RecoadNo);
359
                    strSQL.AppendFormat(" AND A.BRANCHNUMBER = {0}", BuranchNo);
360
                    strSQL.Append(" AND B.RECORDNUMBER = A.RECORDNUMBER");
361
                    strSQL.Append(" AND B.BRANCHNUMBER = A.BRANCHNUMBER");
349 362

  
350 363
                    ArrayList terList = new ArrayList();
351
                    if (!mbtDB.ExecuteReader(strSQL, ref terList)) return true;
364
                    if (!mbtDB.ExecuteReader(strSQL.ToString(), ref terList)) return true;
352 365
                    if (terList.Count == 0) return true;
353 366

  
354 367
                    // 対象テーブルにあるか?
......
378 391
                                if (ShareFlag != 0) return false;
379 392
                            }
380 393

  
381
                            string strSECSQL = "SELECT MAX(B.SECRANK) FROM PERSONINCHARGEMASTER A, SECURITYMASTER B";
382
                            strSECSQL += string.Format(" WHERE DEPARTMENTCODE = {0} AND B.SECCODE = A.SECCODE", wrkRec.ToCode);
394
                            StringBuilder strSECSQL = new StringBuilder();
395
                            strSECSQL.Append("SELECT");
396
                            strSECSQL.Append(" MAX(B.SECRANK)");
397
                            strSECSQL.Append(" FROM");
398
                            strSECSQL.Append(" PERSONINCHARGEMASTER A");
399
                            strSECSQL.Append(", SECURITYMASTER B");
400
                            strSECSQL.Append(" WHERE");
401
                            strSECSQL.AppendFormat(" DEPARTMENTCODE = {0}", wrkRec.ToCode);
402
                            strSECSQL.Append(" AND B.SECCODE = A.SECCODE"); 
403

  
383 404
                            ArrayList SecarList = new ArrayList();
384
                            secDB.ExecuteReader(strSECSQL, ref SecarList);
405
                            secDB.ExecuteReader(strSECSQL.ToString(), ref SecarList);
385 406
                            object[] objSecRec = (object[])SecarList[0];
386 407

  
387 408
                            // 部署コード取得
......
441 462
        }
442 463
        #endregion
443 464

  
444
        #region 掲示板可読権限確認(旧来チェック)
445
        /// <summary>
446
        /// 掲示板可読権限確認(旧来チェック)
447
        /// </summary>
448
        /// <param name="RecoadNo">レコード番号</param>
449
        /// <param name="BuranchNo">レコード枝番</param>
450
        /// <param name="bRead">読込許可・書込み許可</param>
451
        /// <returns></returns>
452
        public static bool MessageOldPermission(int RecoadNo, int BuranchNo, bool bRead = true)
453
        {
454
            IOMessageBoardTerget mbtDB = new IOMessageBoardTerget();
455
            IOMessageBoardData mbdDB = new IOMessageBoardData();
456
            try
457
            {
458
                // メッセージデータの取得
459
                string strSQL = mbdDB.CreatePrimarykeyString(RecoadNo, BuranchNo);
460
                MessageBoardData mbdRec = new MessageBoardData();
461
                if (!mbdDB.SelectAction(strSQL, ref mbdRec)) return false;
462

  
463
                // 書込み者のデータを取得する
464
                PersonInChargeMaster PicRec = new PersonInChargeMaster();
465
                // 秘書からの連絡と部署は読込対象外
466
                if (mbdRec.FromCode == CommonDefine.s_MsgBoardSystemCode)
467
                {   // 秘書からの連絡
468
                    PicRec.PersonCode = CommonDefine.s_MsgBoardSystemCode;
469
                    PicRec.SecurityManagement = 9;
470
                }
471
                else if (mbdRec.FromCode < 99999)
472
                {   // 部署の場合
473
                    if (mbdRec.FromCode == CommonDefine.s_PresidentsOffice)
474
                    {   // 社長室はセキュリティ区分を上げる
475
                        PicRec.SecurityManagement = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key;
476
                    }
477
                    else
478
                    {   // 他の部署はセキュリティ無
479
                        PicRec.SecurityManagement = 9;
480
                    }
481
                }
482
                else if (mbdRec.FromCode == CommonDefine.AdminCode)
483
                {
484
                    // 管理者データ
485
                    PicRec.PersonCode = CommonDefine.AdminCode;
486
                    PicRec.PersonName = CommonDefine.AdminUser;
487
                    PicRec.PassWord = CommonDefine.AdminPass;
488
                    PicRec.SecurityManagement = CommonDefine.AdminSecurityManagement;
489
                }
490
                else
491
                {   // 書込み者のセキュリティ区分を取得する
492
                    PicRec.SecurityManagement = GetPersonSecyrity(mbdRec.FromCode);
493
                }
494

  
495
                bool MacthFlg = false;
496
                // システム権限によってデータアクセスに制限がある
497
                if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement)
498
                {
499
                    // システム管理者(すべて対象)
500
                    MacthFlg = true;
501
                    return true;
502
                }
503
                else if (CommonMotions.LoginUserData.SecurityManagement
504
                            == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key)
505
                {
506
                    // 最高機密管理者(すべて対象)
507
                    MacthFlg = true;
508
                    return true;
509
                }
510
                else if (CommonMotions.LoginUserData.SecurityManagement
511
                            == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SupervisorAuthority].Key)
512
                {
513
                    // 統括機密管理者(機能制限)
514
                    MacthFlg = true;
515
                    // 自分より上位のデータは見えない
516
                    if (PicRec.SecurityManagement < CommonMotions.LoginUserData.SecurityManagement) MacthFlg = false;
517
                }
518
                else if (CommonMotions.LoginUserData.SecurityManagement
519
                            == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key)
520
                {
521
                    // 機密管理者(書込み者が自部署の場合)
522
                    MacthFlg = GetPersonInDivision(mbdRec.FromCode);
523
                    // 自分より上位のデータは見えない
524
                    if (PicRec.SecurityManagement < CommonMotions.LoginUserData.SecurityManagement) MacthFlg = false;
525
                }
526

  
527
                // 書込み時は以下のチェックをしない
528
                if (!bRead) return MacthFlg;
529

  
530
                // 掲示板閲覧テーブルのチェック
531
                strSQL = mbtDB.CreatePrimarykeyString(RecoadNo, BuranchNo);
532
                List<MessageBoardTerget> terList = new List<MessageBoardTerget>();
533
                if (!mbtDB.SelectAction(strSQL, ref terList)) return true;
534
                if (terList.Count == 0) return true;
535

  
536
                // 対象テーブルにあるか?
537
                foreach (MessageBoardTerget wrkRec in terList)
538
                {
539
                    // 全員の場合はOK
540
                    if (wrkRec.ToCode == CommonDefine.s_AllMembersCode)
541
                    {
542
                        MacthFlg = true;
543
                        break;
544
                    }
545
                    // 対象が自分の場合はOK
546
                    else if (wrkRec.ToCode == CommonMotions.LoginUserData.PersonCode)
547
                    {
548
                        MacthFlg = true;
549
                        break;
550
                    }
551

  
552
                    // ----------
553
                    // 所属長がログインの場合は対象者が自部署かどうかを確認する.
554
                    if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key)
555
                    {
556
                        if (GetPersonInDivision(wrkRec.ToCode))
557
                        {
558
                            MacthFlg = true;
559
                            break;
560
                        }
561
                    }
562

  
563
                    // ----------
564
                    // 対象者コードが5桁以下ならば部署コード
565
                    if (wrkRec.ToCode < 99999)
566
                    {
567
                        // 所属が対象ならばOK
568
                        if (wrkRec.ToCode == CommonMotions.LoginUserData.DepartmentCode)
569
                        {   // 管理者対象フラグがONの時にログイン者が一般ユーザーの場合はメッセージを見せない
570
                            if (mbdRec.ShareFlag != 0
571
                                && CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key)
572
                                continue;
573

  
574
                            // 上記以外はOK
575
                            MacthFlg = true;
576
                            break;
577
                        }
578
                        else
579
                        {   // 対象者に社長室があればOFFにしておく
580
                            if (wrkRec.ToCode == CommonDefine.s_PresidentsOffice)
581
                            {
582
                                MacthFlg = false;
583
                            }
584
                        }
585
                    }
586

  
587
                    // 対象者に上位者がいる場合は一応読込み不可(リストに本人や所属部署があればOKにするため処理は抜けない)
588
                    if (GetPersonSecyrity(wrkRec.ToCode) < CommonMotions.LoginUserData.SecurityManagement)
589
                    {
590
                        MacthFlg = false;
591
                    }
592
                }
593

  
594
                return MacthFlg;
595
            }
596
            catch (Exception ex)
597
            {
598
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
599
                return false;
600
            }
601
            finally
602
            {
603
                mbtDB.close(); mbtDB = null;
604
                mbdDB.close(); mbdDB = null;
605
            }
606
        }
607
        #endregion
608

  
609 465
        #region 指定担当者がログインユーザー配下の所属かどうかを確認する
610 466
        /// <summary>
611 467
        /// 指定担当者がログインユーザー配下の所属かどうかを確認する
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs
781 781
        }
782 782
        #endregion
783 783

  
784
        #region ?R?????g???{?^??????
784
        #region ?R?????g???{?^???????i???g?p?j
785 785
        /// <summary>
786 786
        /// ?R?????g???{?^??????
787 787
        /// </summary>
......
792 792
            RemoveTreeViewComment();
793 793
        }
794 794
        #endregion
795

  
796
        #region ?R?????g??W?{?^??????
797
        /// <summary>
798
        /// ?R?????g??W?{?^??????
799
        /// </summary>
800
        /// <param name="sender"></param>
801
        /// <param name="e"></param>
802
        private void btnEditComment_Click(object sender, EventArgs e)
803
        {
804
            EditTreeViewComment();
805
        }
806
        #endregion
795 807
    }
796 808
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.designer.cs
31 31
        private void InitializeComponent()
32 32
        {
33 33
            this.components = new System.ComponentModel.Container();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
41 41
            this.label1 = new System.Windows.Forms.Label();
42 42
            this.btnEnd = new System.Windows.Forms.Button();
43 43
            this.panel2 = new System.Windows.Forms.Panel();
44
            this.dgvEntryData = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
45
            this.Column01 = new System.Windows.Forms.DataGridViewTextBoxColumn();
46
            this.Column02 = new System.Windows.Forms.DataGridViewTextBoxColumn();
47
            this.Column03 = new System.Windows.Forms.DataGridViewTextBoxColumn();
48
            this.Column06 = new System.Windows.Forms.DataGridViewTextBoxColumn();
49
            this.Column07 = new System.Windows.Forms.DataGridViewTextBoxColumn();
50
            this.Column04 = new System.Windows.Forms.DataGridViewTextBoxColumn();
51
            this.Column05 = new System.Windows.Forms.DataGridViewTextBoxColumn();
52
            this.Column08 = new System.Windows.Forms.DataGridViewTextBoxColumn();
44 53
            this.panel1 = new System.Windows.Forms.Panel();
45 54
            this.lblLabel03 = new System.Windows.Forms.Label();
46 55
            this.label2 = new System.Windows.Forms.Label();
......
78 87
            this.btnNotPetition = new System.Windows.Forms.Button();
79 88
            this.panel5 = new System.Windows.Forms.Panel();
80 89
            this.btnReturnComment = new System.Windows.Forms.Button();
81
            this.btnRemoveComment = new System.Windows.Forms.Button();
90
            this.btnEditComment = new System.Windows.Forms.Button();
82 91
            this.btnEntryComment = new System.Windows.Forms.Button();
83 92
            this.label18 = new System.Windows.Forms.Label();
84 93
            this.tvDispData = new System.Windows.Forms.TreeView();
85
            this.dgvEntryData = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
86
            this.Column01 = new System.Windows.Forms.DataGridViewTextBoxColumn();
87
            this.Column02 = new System.Windows.Forms.DataGridViewTextBoxColumn();
88
            this.Column03 = new System.Windows.Forms.DataGridViewTextBoxColumn();
89
            this.Column06 = new System.Windows.Forms.DataGridViewTextBoxColumn();
90
            this.Column07 = new System.Windows.Forms.DataGridViewTextBoxColumn();
91
            this.Column04 = new System.Windows.Forms.DataGridViewTextBoxColumn();
92
            this.Column05 = new System.Windows.Forms.DataGridViewTextBoxColumn();
93
            this.Column08 = new System.Windows.Forms.DataGridViewTextBoxColumn();
94 94
            this.panel2.SuspendLayout();
95
            ((System.ComponentModel.ISupportInitialize)(this.dgvEntryData)).BeginInit();
95 96
            this.panel1.SuspendLayout();
96 97
            this.panel3.SuspendLayout();
97 98
            this.panel4.SuspendLayout();
98 99
            this.panel5.SuspendLayout();
99
            ((System.ComponentModel.ISupportInitialize)(this.dgvEntryData)).BeginInit();
100 100
            this.SuspendLayout();
101 101
            // 
102 102
            // label1
......
136 136
            this.panel2.Size = new System.Drawing.Size(760, 160);
137 137
            this.panel2.TabIndex = 15;
138 138
            // 
139
            // dgvEntryData
140
            // 
141
            this.dgvEntryData.AllowUserToAddRows = false;
142
            this.dgvEntryData.AllowUserToDeleteRows = false;
143
            this.dgvEntryData.AllowUserToResizeColumns = false;
144
            this.dgvEntryData.AllowUserToResizeRows = false;
145
            this.dgvEntryData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
146
            this.dgvEntryData.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
147
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
148
            dataGridViewCellStyle8.BackColor = System.Drawing.Color.Black;
149
            dataGridViewCellStyle8.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
150
            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White;
151
            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
152
            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
153
            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
154
            this.dgvEntryData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
155
            this.dgvEntryData.ColumnHeadersHeight = 24;
156
            this.dgvEntryData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
157
            this.dgvEntryData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
158
            this.Column01,
159
            this.Column02,
160
            this.Column03,
161
            this.Column06,
162
            this.Column07,
163
            this.Column04,
164
            this.Column05,
165
            this.Column08});
166
            this.dgvEntryData.EnableHeadersVisualStyles = false;
167
            this.dgvEntryData.Location = new System.Drawing.Point(6, 5);
168
            this.dgvEntryData.Name = "dgvEntryData";
169
            this.dgvEntryData.RowHeadersVisible = false;
170
            this.dgvEntryData.RowHeadersWidth = 20;
171
            this.dgvEntryData.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
172
            this.dgvEntryData.RowTemplate.Height = 24;
173
            this.dgvEntryData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
174
            this.dgvEntryData.Size = new System.Drawing.Size(744, 146);
175
            this.dgvEntryData.TabIndex = 8;
176
            // 
177
            // Column01
178
            // 
179
            this.Column01.Frozen = true;
180
            this.Column01.HeaderText = "承認者コード";
181
            this.Column01.Name = "Column01";
182
            this.Column01.ReadOnly = true;
183
            this.Column01.Resizable = System.Windows.Forms.DataGridViewTriState.False;
184
            this.Column01.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
185
            this.Column01.Visible = false;
186
            this.Column01.Width = 5;
187
            // 
188
            // Column02
189
            // 
190
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
191
            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
192
            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Black;
193
            this.Column02.DefaultCellStyle = dataGridViewCellStyle9;
194
            this.Column02.Frozen = true;
195
            this.Column02.HeaderText = "№";
196
            this.Column02.Name = "Column02";
197
            this.Column02.ReadOnly = true;
198
            this.Column02.Resizable = System.Windows.Forms.DataGridViewTriState.False;
199
            this.Column02.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
200
            this.Column02.Width = 44;
201
            // 
202
            // Column03
203
            // 
204
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
205
            this.Column03.DefaultCellStyle = dataGridViewCellStyle10;
206
            this.Column03.Frozen = true;
207
            this.Column03.HeaderText = "承認者名";
208
            this.Column03.Name = "Column03";
209
            this.Column03.ReadOnly = true;
210
            this.Column03.Resizable = System.Windows.Forms.DataGridViewTriState.False;
211
            this.Column03.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
212
            this.Column03.Width = 150;
213
            // 
214
            // Column06
215
            // 
216
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
217
            this.Column06.DefaultCellStyle = dataGridViewCellStyle11;
218
            this.Column06.Frozen = true;
219
            this.Column06.HeaderText = "承認状態";
220
            this.Column06.Name = "Column06";
221
            this.Column06.ReadOnly = true;
222
            this.Column06.Resizable = System.Windows.Forms.DataGridViewTriState.False;
223
            this.Column06.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
224
            this.Column06.Width = 125;
225
            // 
226
            // Column07
227
            // 
228
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
229
            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
230
            this.Column07.DefaultCellStyle = dataGridViewCellStyle12;
231
            this.Column07.Frozen = true;
232
            this.Column07.HeaderText = "処理日付";
233
            this.Column07.Name = "Column07";
234
            this.Column07.ReadOnly = true;
235
            this.Column07.Resizable = System.Windows.Forms.DataGridViewTriState.False;
236
            this.Column07.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
237
            this.Column07.Width = 120;
238
            // 
239
            // Column04
240
            // 
241
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
242
            this.Column04.DefaultCellStyle = dataGridViewCellStyle13;
243
            this.Column04.HeaderText = "所 属";
244
            this.Column04.Name = "Column04";
245
            this.Column04.ReadOnly = true;
246
            this.Column04.Resizable = System.Windows.Forms.DataGridViewTriState.False;
247
            this.Column04.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
248
            this.Column04.Width = 145;
249
            // 
250
            // Column05
251
            // 
252
            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
253
            this.Column05.DefaultCellStyle = dataGridViewCellStyle14;
254
            this.Column05.HeaderText = "役 職";
255
            this.Column05.Name = "Column05";
256
            this.Column05.ReadOnly = true;
257
            this.Column05.Resizable = System.Windows.Forms.DataGridViewTriState.False;
258
            this.Column05.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
259
            this.Column05.Width = 157;
260
            // 
261
            // Column08
262
            // 
263
            this.Column08.HeaderText = "最終承認区分";
264
            this.Column08.Name = "Column08";
265
            this.Column08.Visible = false;
266
            // 
139 267
            // panel1
140 268
            // 
141 269
            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
......
561 689
            this.panel5.BackColor = System.Drawing.Color.Gold;
562 690
            this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
563 691
            this.panel5.Controls.Add(this.btnReturnComment);
564
            this.panel5.Controls.Add(this.btnRemoveComment);
692
            this.panel5.Controls.Add(this.btnEditComment);
565 693
            this.panel5.Controls.Add(this.btnEntryComment);
566 694
            this.panel5.Controls.Add(this.label18);
567 695
            this.panel5.Controls.Add(this.tvDispData);
......
584 712
            this.btnReturnComment.UseVisualStyleBackColor = false;
585 713
            this.btnReturnComment.Click += new System.EventHandler(this.btnReturnComment_Click);
586 714
            // 
587
            // btnRemoveComment
715
            // btnEditComment
588 716
            // 
589
            this.btnRemoveComment.BackColor = System.Drawing.Color.Red;
590
            this.btnRemoveComment.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
591
            this.btnRemoveComment.ForeColor = System.Drawing.Color.Black;
592
            this.btnRemoveComment.Location = new System.Drawing.Point(434, 3);
593
            this.btnRemoveComment.Name = "btnRemoveComment";
594
            this.btnRemoveComment.Size = new System.Drawing.Size(118, 30);
595
            this.btnRemoveComment.TabIndex = 162;
596
            this.btnRemoveComment.TabStop = false;
597
            this.btnRemoveComment.Text = "コメント削除";
598
            this.btnRemoveComment.UseVisualStyleBackColor = false;
599
            this.btnRemoveComment.Click += new System.EventHandler(this.btnRemoveComment_Click);
717
            this.btnEditComment.BackColor = System.Drawing.Color.DarkOrange;
718
            this.btnEditComment.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
719
            this.btnEditComment.ForeColor = System.Drawing.Color.Black;
720
            this.btnEditComment.Location = new System.Drawing.Point(434, 3);
721
            this.btnEditComment.Name = "btnEditComment";
722
            this.btnEditComment.Size = new System.Drawing.Size(118, 30);
723
            this.btnEditComment.TabIndex = 162;
724
            this.btnEditComment.TabStop = false;
725
            this.btnEditComment.Text = "コメント編集";
726
            this.btnEditComment.UseVisualStyleBackColor = false;
727
            this.btnEditComment.Click += new System.EventHandler(this.btnEditComment_Click);
600 728
            // 
601 729
            // btnEntryComment
602 730
            // 
......
633 761
            this.tvDispData.Size = new System.Drawing.Size(544, 308);
634 762
            this.tvDispData.TabIndex = 158;
635 763
            // 
636
            // dgvEntryData
637
            // 
638
            this.dgvEntryData.AllowUserToAddRows = false;
639
            this.dgvEntryData.AllowUserToDeleteRows = false;
640
            this.dgvEntryData.AllowUserToResizeColumns = false;
641
            this.dgvEntryData.AllowUserToResizeRows = false;
642
            this.dgvEntryData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
643
            this.dgvEntryData.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
644
            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
645
            dataGridViewCellStyle15.BackColor = System.Drawing.Color.Black;
646
            dataGridViewCellStyle15.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
647
            dataGridViewCellStyle15.ForeColor = System.Drawing.Color.White;
648
            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
649
            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
650
            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
651
            this.dgvEntryData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
652
            this.dgvEntryData.ColumnHeadersHeight = 24;
653
            this.dgvEntryData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
654
            this.dgvEntryData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
655
            this.Column01,
656
            this.Column02,
657
            this.Column03,
658
            this.Column06,
659
            this.Column07,
660
            this.Column04,
661
            this.Column05,
662
            this.Column08});
663
            this.dgvEntryData.EnableHeadersVisualStyles = false;
664
            this.dgvEntryData.Location = new System.Drawing.Point(6, 5);
665
            this.dgvEntryData.Name = "dgvEntryData";
666
            this.dgvEntryData.RowHeadersVisible = false;
667
            this.dgvEntryData.RowHeadersWidth = 20;
668
            this.dgvEntryData.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
669
            this.dgvEntryData.RowTemplate.Height = 24;
670
            this.dgvEntryData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
671
            this.dgvEntryData.Size = new System.Drawing.Size(744, 146);
672
            this.dgvEntryData.TabIndex = 8;
673
            // 
674
            // Column01
675
            // 
676
            this.Column01.Frozen = true;
677
            this.Column01.HeaderText = "承認者コード";
678
            this.Column01.Name = "Column01";
679
            this.Column01.ReadOnly = true;
680
            this.Column01.Resizable = System.Windows.Forms.DataGridViewTriState.False;
681
            this.Column01.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
682
            this.Column01.Visible = false;
683
            this.Column01.Width = 5;
684
            // 
685
            // Column02
686
            // 
687
            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
688
            dataGridViewCellStyle16.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
689
            dataGridViewCellStyle16.ForeColor = System.Drawing.Color.Black;
690
            this.Column02.DefaultCellStyle = dataGridViewCellStyle16;
691
            this.Column02.Frozen = true;
692
            this.Column02.HeaderText = "№";
693
            this.Column02.Name = "Column02";
694
            this.Column02.ReadOnly = true;
695
            this.Column02.Resizable = System.Windows.Forms.DataGridViewTriState.False;
696
            this.Column02.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
697
            this.Column02.Width = 44;
698
            // 
699
            // Column03
700
            // 
701
            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
702
            this.Column03.DefaultCellStyle = dataGridViewCellStyle17;
703
            this.Column03.Frozen = true;
704
            this.Column03.HeaderText = "承認者名";
705
            this.Column03.Name = "Column03";
706
            this.Column03.ReadOnly = true;
707
            this.Column03.Resizable = System.Windows.Forms.DataGridViewTriState.False;
708
            this.Column03.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
709
            this.Column03.Width = 150;
710
            // 
711
            // Column06
712
            // 
713
            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
714
            this.Column06.DefaultCellStyle = dataGridViewCellStyle18;
715
            this.Column06.Frozen = true;
716
            this.Column06.HeaderText = "承認状態";
717
            this.Column06.Name = "Column06";
718
            this.Column06.ReadOnly = true;
719
            this.Column06.Resizable = System.Windows.Forms.DataGridViewTriState.False;
720
            this.Column06.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
721
            this.Column06.Width = 125;
722
            // 
723
            // Column07
724
            // 
725
            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
726
            dataGridViewCellStyle19.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
727
            this.Column07.DefaultCellStyle = dataGridViewCellStyle19;
728
            this.Column07.Frozen = true;
729
            this.Column07.HeaderText = "処理日付";
730
            this.Column07.Name = "Column07";
731
            this.Column07.ReadOnly = true;
732
            this.Column07.Resizable = System.Windows.Forms.DataGridViewTriState.False;
733
            this.Column07.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
734
            this.Column07.Width = 120;
735
            // 
736
            // Column04
737
            // 
738
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
739
            this.Column04.DefaultCellStyle = dataGridViewCellStyle20;
740
            this.Column04.HeaderText = "所 属";
741
            this.Column04.Name = "Column04";
742
            this.Column04.ReadOnly = true;
743
            this.Column04.Resizable = System.Windows.Forms.DataGridViewTriState.False;
744
            this.Column04.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
745
            this.Column04.Width = 145;
746
            // 
747
            // Column05
748
            // 
749
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
750
            this.Column05.DefaultCellStyle = dataGridViewCellStyle21;
751
            this.Column05.HeaderText = "役 職";
752
            this.Column05.Name = "Column05";
753
            this.Column05.ReadOnly = true;
754
            this.Column05.Resizable = System.Windows.Forms.DataGridViewTriState.False;
755
            this.Column05.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
756
            this.Column05.Width = 157;
757
            // 
758
            // Column08
759
            // 
760
            this.Column08.HeaderText = "最終承認区分";
761
            this.Column08.Name = "Column08";
762
            this.Column08.Visible = false;
763
            // 
764 764
            // FrmApprovalPerson
765 765
            // 
766 766
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
784 784
            this.Load += new System.EventHandler(this.FrmApprovalPerson_Load);
785 785
            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FrmApprovalPerson_KeyDown);
786 786
            this.panel2.ResumeLayout(false);
787
            ((System.ComponentModel.ISupportInitialize)(this.dgvEntryData)).EndInit();
787 788
            this.panel1.ResumeLayout(false);
788 789
            this.panel3.ResumeLayout(false);
789 790
            this.panel4.ResumeLayout(false);
790 791
            this.panel4.PerformLayout();
791 792
            this.panel5.ResumeLayout(false);
792
            ((System.ComponentModel.ISupportInitialize)(this.dgvEntryData)).EndInit();
793 793
            this.ResumeLayout(false);
794 794

  
795 795
        }
......
837 837
        private System.Windows.Forms.Panel panel5;
838 838
        private System.Windows.Forms.TreeView tvDispData;
839 839
        private System.Windows.Forms.Label label18;
840
        private System.Windows.Forms.Button btnRemoveComment;
840
        private System.Windows.Forms.Button btnEditComment;
841 841
        private System.Windows.Forms.Button btnEntryComment;
842 842
        private System.Windows.Forms.Button btnReturnComment;
843 843
        private System.Windows.Forms.Button btnRePetition;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.resx
117 117
  <resheader name="writer">
118 118
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119 119
  </resheader>
120
  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121
    <value>17, 17</value>
122
  </metadata>
123
  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124
    <value>17, 17</value>
125
  </metadata>
126 120
  <metadata name="Column03.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
127 121
    <value>True</value>
128 122
  </metadata>
......
141 135
  <metadata name="Column08.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
142 136
    <value>True</value>
143 137
  </metadata>
138
  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
139
    <value>17, 17</value>
140
  </metadata>
141
  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
142
    <value>17, 17</value>
143
  </metadata>
144 144
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
145 145
    <value>35</value>
146 146
  </metadata>
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs
1371 1371
            try
1372 1372
            {
1373 1373
                TreeNode TargetNodes = tvDispData.SelectedNode;
1374
                if (!bNewComment)
1374
                // 返信時に行が選択されていない場合
1375
                if (!bNewComment && TargetNodes == null)
1375 1376
                {
1376
                    if (TargetNodes == null)
1377
                    {
1378
                        MessageBox.Show("返信対象コメントが選択されていません。", "選択エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
1379
                        return;
1380
                    }
1377
                    MessageBox.Show("返信対象コメントが選択されていません。"
1378
                                    , "選択エラー"
1379
                                    , MessageBoxButtons.OK
1380
                                    , MessageBoxIcon.Error);
1381
                    return;
1381 1382
                }
1382 1383

  
1383 1384
                // コメント入力画面表示
1385
                frm.EditFlag = (int)FrmInputComment.EditFlagDef.NewData;
1384 1386
                frm.ShowDialog();
1385 1387
                if (frm.EndButton == DialogResult.No) return;
1386 1388

  
......
1417 1419
        }
1418 1420
        #endregion
1419 1421

  
1422
        #region 指示連絡コメント編集処理
1423
        /// <summary>
1424
        /// 指示連絡コメント編集処理
1425
        /// </summary>
1426
        private void EditTreeViewComment()
1427
        {
1428
            FrmInputComment frm = new FrmInputComment();
1429
            try
1430
            {
1431
                // 対象データ取得
1432
                TreeNode TargetNodes = tvDispData.SelectedNode;
1433
                if (TargetNodes == null)
1434
                {
1435
                    MessageBox.Show("編集対象コメントが選択されていません。"
1436
                                    , "選択エラー"
1437
                                    , MessageBoxButtons.OK
1438
                                    , MessageBoxIcon.Error);
1439
                    return;
1440
                }
1441

  
1442
                // メッセージテキスト取得
1443
                string strNodeText = TargetNodes.Text;
1444
                for (int i = 0; i < 2; i++)
1445
                {
1446
                    strNodeText = strNodeText.Substring(strNodeText.IndexOf("-") + 1);
1447
                }
1448

  
1449
                // コメント入力画面表示
1450
                frm.EditFlag = (int)FrmInputComment.EditFlagDef.EditData;
1451
                frm.CommentString = strNodeText;
1452
                frm.ShowDialog();
1453
                if (frm.EndButton == DialogResult.No) return;
1454

  
1455
                if (frm.CommentString.Length == 0)
1456
                {
1457

  
1458
                    if (MessageBox.Show("対象のコメントを削除します。\nよろしいでしょうか?",
1459
                                        "削除確認",
1460
                                        MessageBoxButtons.OKCancel,
1461
                                        MessageBoxIcon.Information) == DialogResult.Cancel) return;
1462

  
1463
                    // 削除
1464
                    TargetNodes.Remove();
1465
                }
1466
                else
1467
                {
1468
                    // 編集後テキストセット
1469
                    string DispString = string.Empty;
1470
                    DispString = string.Format("{0}月{1}日-{2}-{3}", DateTime.Today.Month.ToString("00"),
1471
                                                                        DateTime.Today.Day.ToString("00"),
1472
                                                                        CommonMotions.LoginUserData.PersonName,
1473
                                                                        frm.CommentString);
1474
                    TargetNodes.Text = DispString;
1475
                }
1476

  
1477
                // データ登録
1478
                if (!EntryComment()) return;
1479

  
1480
                // 完了メッセージ
1481
                CommonMotions.EntryEndMessage("コメントデータ");
1482
            }
1483
            catch (Exception ex)
1484
            {
1485
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1486
            }
1487
            finally
1488
            {
1489
                frm.Dispose(); frm = null;
1490
            }
1491
        }
1492
        #endregion
1493

  
1420 1494
        #region 指示連絡コメント削除処理
1421 1495
        /// <summary>
1422 1496
        /// 指示連絡コメント削除処理
......
1531 1605
            catch (Exception ex)
1532 1606
            {
1533 1607
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1608
                CommentDB.rollback();
1534 1609
                return false;
1535 1610
            }
1536 1611
            finally
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs
694 694
                }
695 695

  
696 696
                // ?R?????g??
697
                RemoveCommentData();
697
                //RemoveCommentData();
698 698

  
699 699
                // ???????b?Z?[?W
700 700
                CommonMotions.EntryEndMessage("?H???\???f?[?^", "?\?????");
......
755 755
        }
756 756
        #endregion
757 757

  
758
        #region ?R?????g???{?^??????
758
        #region ?R?????g???{?^???????i???g?p?j
759 759
        /// <summary>
760
        /// ?R?????g???{?^??????
760
        /// ?R?????g???{?^???????i???g?p?j
761 761
        /// </summary>
762 762
        /// <param name="sender"></param>
763 763
        /// <param name="e"></param>
......
766 766
            RemoveTreeViewComment();
767 767
        }
768 768
        #endregion
769

  
770
        #region ?R?????g??W?{?^??????
771
        /// <summary>
772
        /// ?R?????g??W?{?^??????
773
        /// </summary>
774
        /// <param name="sender"></param>
775
        /// <param name="e"></param>
776
        private void btnEditComment_Click(object sender, EventArgs e)
777
        {
778
            EditTreeViewComment();
779
        }
780
        #endregion
769 781
    }
770 782
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.designer.cs
67 67
            this.btnRePetition = new System.Windows.Forms.Button();
68 68
            this.panel5 = new System.Windows.Forms.Panel();
69 69
            this.btnReturnComment = new System.Windows.Forms.Button();
70
            this.btnRemoveComment = new System.Windows.Forms.Button();
70
            this.btnEditComment = new System.Windows.Forms.Button();
71 71
            this.btnEntryComment = new System.Windows.Forms.Button();
72 72
            this.label18 = new System.Windows.Forms.Label();
73 73
            this.tvDispData = new System.Windows.Forms.TreeView();
......
459 459
            this.panel5.BackColor = System.Drawing.Color.Gold;
460 460
            this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
461 461
            this.panel5.Controls.Add(this.btnReturnComment);
462
            this.panel5.Controls.Add(this.btnRemoveComment);
462
            this.panel5.Controls.Add(this.btnEditComment);
463 463
            this.panel5.Controls.Add(this.btnEntryComment);
464 464
            this.panel5.Controls.Add(this.label18);
465 465
            this.panel5.Controls.Add(this.tvDispData);
......
482 482
            this.btnReturnComment.UseVisualStyleBackColor = false;
483 483
            this.btnReturnComment.Click += new System.EventHandler(this.btnReturnComment_Click);
484 484
            // 
485
            // btnRemoveComment
485
            // btnEditComment
486 486
            // 
487
            this.btnRemoveComment.BackColor = System.Drawing.Color.Red;
488
            this.btnRemoveComment.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
489
            this.btnRemoveComment.ForeColor = System.Drawing.Color.Black;
490
            this.btnRemoveComment.Location = new System.Drawing.Point(434, 3);
491
            this.btnRemoveComment.Name = "btnRemoveComment";
492
            this.btnRemoveComment.Size = new System.Drawing.Size(118, 30);
493
            this.btnRemoveComment.TabIndex = 162;
494
            this.btnRemoveComment.TabStop = false;
495
            this.btnRemoveComment.Text = "コメント削除";
496
            this.btnRemoveComment.UseVisualStyleBackColor = false;
497
            this.btnRemoveComment.Click += new System.EventHandler(this.btnRemoveComment_Click);
487
            this.btnEditComment.BackColor = System.Drawing.Color.DarkOrange;
488
            this.btnEditComment.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
489
            this.btnEditComment.ForeColor = System.Drawing.Color.Black;
490
            this.btnEditComment.Location = new System.Drawing.Point(434, 3);
491
            this.btnEditComment.Name = "btnEditComment";
492
            this.btnEditComment.Size = new System.Drawing.Size(118, 30);
493
            this.btnEditComment.TabIndex = 162;
494
            this.btnEditComment.TabStop = false;
495
            this.btnEditComment.Text = "コメント編集";
496
            this.btnEditComment.UseVisualStyleBackColor = false;
497
            this.btnEditComment.Click += new System.EventHandler(this.btnEditComment_Click);
498 498
            // 
499 499
            // btnEntryComment
500 500
            // 
......
954 954
        private System.Windows.Forms.Panel panel5;
955 955
        private System.Windows.Forms.TreeView tvDispData;
956 956
        private System.Windows.Forms.Label label18;
957
        private System.Windows.Forms.Button btnRemoveComment;
957
        private System.Windows.Forms.Button btnEditComment;
958 958
        private System.Windows.Forms.Button btnEntryComment;
959 959
        private System.Windows.Forms.Button btnReturnComment;
960 960
        private System.Windows.Forms.DataGridViewTextBoxColumn Column01;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs
1249 1249
            IOProcessApprovalComment CommentDB = new IOProcessApprovalComment();
1250 1250
            try
1251 1251
            {
1252
                // Clear
1252 1253
                tvDispData.Nodes.Clear();
1253 1254

  
1255
                // Comment Data Get
1254 1256
                StringBuilder strSQL = new StringBuilder();
1255 1257
                strSQL.Append(CommentDB.CreatePrimarykeyString(m_ConstructionCode, m_ApprovalCode, m_OrderNo));
1256 1258
                List<ProcessApprovalComment> CommentList = new List<ProcessApprovalComment>();
1257 1259
                if (!CommentDB.SelectAction(strSQL.ToString(), ref CommentList)) return;
1258 1260

  
1261
                // Display Node at Loop
1259 1262
                TreeNode treeNode = null;
1260 1263
                for (int nCommentCnt = 0; nCommentCnt < CommentList.Count; nCommentCnt++)
1261 1264
                {
......
1365 1368
            try
1366 1369
            {
1367 1370
                TreeNode TargetNodes = tvDispData.SelectedNode;
1368
                if (!bNewComment)
1371
                // 返信時に行が選択されていない場合
1372
                if (!bNewComment && TargetNodes == null)
1369 1373
                {
1370
                    if (TargetNodes == null)
1371
                    {
1372
                        MessageBox.Show("返信対象コメントが選択されていません。", "選択エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
1373
                        return;
1374
                    }
1374
                    MessageBox.Show("返信対象コメントが選択されていません。"
1375
                                    , "選択エラー"
1376
                                    , MessageBoxButtons.OK
1377
                                    , MessageBoxIcon.Error);
1378
                    return;
1375 1379
                }
1376 1380

  
1381
                frm.EditFlag = (int)FrmInputComment.EditFlagDef.NewData;
1377 1382
                // コメント入力画面表示
1378 1383
                frm.ShowDialog();
1384
                // 終了ボタン押下時以外は以下を処理しない
1379 1385
                if (frm.EndButton == DialogResult.No) return;
1380 1386

  
1381 1387
                string DispString = string.Empty;
......
1383 1389
                                                                    DateTime.Today.Day.ToString("00"),
1384 1390
                                                                    CommonMotions.LoginUserData.PersonName,
1385 1391
                                                                    frm.CommentString);
1386
                // コメント追加
1392
                
1387 1393
                if (bNewComment)
1388
                {
1394
                {   // コメント追加
1389 1395
                    tvDispData.Nodes.Add(StringBuiltInReturn(DispString, s_CommentToolTipLength));
1390 1396
                    tvDispData.TopNode.Expand();
1391 1397
                }
1392 1398
                else
1393
                {
1399
                {   // コメント返信追加
1394 1400
                    TargetNodes.Nodes.Add(StringBuiltInReturn(DispString, s_CommentToolTipLength));
1395 1401
                    tvDispData.SelectedNode.Expand();
1396 1402
                }
......
1411 1417
        }
1412 1418
        #endregion
1413 1419

  
1420
        #region 指示連絡コメント編集処理
1421
        /// <summary>
1422
        /// 指示連絡コメント編集処理
1423
        /// </summary>
1424
        private void EditTreeViewComment()
1425
        {
1426
            FrmInputComment frm = new FrmInputComment();
1427
            try
1428
            {
1429
                // 対象データ取得
1430
                TreeNode TargetNodes = tvDispData.SelectedNode;
1431
                if (TargetNodes == null)
1432
                {
1433
                    MessageBox.Show("編集対象コメントが選択されていません。"
1434
                                    , "選択エラー"
1435
                                    , MessageBoxButtons.OK
1436
                                    , MessageBoxIcon.Error);
1437
                    return;
1438
                }
1439

  
1440
                // メッセージテキスト取得
1441
                string strNodeText = TargetNodes.Text;
1442
                for (int i = 0; i < 2; i++)
1443
                {
1444
                    strNodeText = strNodeText.Substring(strNodeText.IndexOf("-") + 1);
1445
                }
1446

  
1447
                // コメント入力画面表示
1448
                frm.EditFlag = (int)FrmInputComment.EditFlagDef.EditData;
1449
                frm.CommentString = strNodeText;
1450
                frm.ShowDialog();
1451
                if (frm.EndButton == DialogResult.No) return;
1452

  
1453
                if (frm.CommentString.Length == 0)
1454
                {
1455

  
1456
                    if (MessageBox.Show("対象のコメントを削除します。\nよろしいでしょうか?",
1457
                                        "削除確認",
1458
                                        MessageBoxButtons.OKCancel,
1459
                                        MessageBoxIcon.Information) == DialogResult.Cancel) return;
1460

  
1461
                    // 削除
1462
                    TargetNodes.Remove();
1463
                }
1464
                else
1465
                {
1466
                    // 編集後テキストセット
1467
                    string DispString = string.Empty;
1468
                    DispString = string.Format("{0}月{1}日-{2}-{3}", DateTime.Today.Month.ToString("00"),
1469
                                                                        DateTime.Today.Day.ToString("00"),
1470
                                                                        CommonMotions.LoginUserData.PersonName,
1471
                                                                        frm.CommentString);
1472
                    TargetNodes.Text = DispString;
1473
                }
1474

  
1475
                // データ登録
1476
                if (!EntryComment(m_ApprovalCode)) return;
1477

  
1478
                // 完了メッセージ
1479
                CommonMotions.EntryEndMessage("コメントデータ");
1480
            }
1481
            catch (Exception ex)
1482
            {
1483
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1484
            }
1485
            finally
1486
            {
1487
                frm.Dispose(); frm = null;
1488
            }
1489
        }
1490
        #endregion
1491

  
1414 1492
        #region 指示連絡コメント削除処理
1415 1493
        /// <summary>
1416 1494
        /// 指示連絡コメント削除処理
......
1433 1511

  
1434 1512
                // 削除
1435 1513
                TargetNodes.Remove();
1436
            
1514

  
1437 1515
                // データ登録
1438 1516
                if (!EntryComment(m_ApprovalCode)) return;
1439 1517

  
......
1458 1536
        private int m_InsertParentNo = 0;
1459 1537
        #endregion
1460 1538

  
1461
        #region コメントデータ一括削除
1539
        #region コメントデータ一括削除(未使用)
1462 1540
        /// <summary>
1463 1541
        /// コメントデータ一括削除
1464 1542
        /// </summary>
......
1517 1595
                {
1518 1596
                    MessageBox.Show("承認申請コメント登録に失敗しました。", "登録エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
1519 1597
                    CommentDB.rollback();
1598
                    return false;
1520 1599
                }
1521 1600

  
1522 1601
                return true;
......
1524 1603
            catch (Exception ex)
1525 1604
            {
1526 1605
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1606
                CommentDB.rollback();
1527 1607
                return false;
1528 1608
            }
1529 1609
            finally
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
259 259
            /// </summary>
260 260
            BillingStartDate,
261 261
            /// <summary>
262
            /// 53:??????????
262
            /// 53:?????m?F??
263 263
            /// </summary>
264 264
            BillingComplateDate,
265 265
            /// <summary>
......
451 451
                                                                        new KeyValuePair<int, string>(50,"?_??H??????"),
452 452
                                                                        new KeyValuePair<int, string>(51,"???????(???g?b?v)"),
453 453
                                                                        new KeyValuePair<int, string>(52,"?????????J?n??"),
454
                                                                        new KeyValuePair<int, string>(53,"??????????"),
454
                                                                        new KeyValuePair<int, string>(53,"?????m?F??"),
455 455
                                                                        new KeyValuePair<int, string>(54,"?J?n?\???"),
456 456
                                                                        new KeyValuePair<int, string>(55,"?c??S??????"),
457 457
                                                                        new KeyValuePair<int, string>(56,"??Z????m?F?\????"),
......
587 587
        /// ?K?{????`?F?b?N?p?}?b?v
588 588
        /// </summary>
589 589
        //?@0:???????|1:?????o?|2:????C?H???|3:?? ?? ???|4:??|5:???????p
590
        //?|6:?{?H?????|7:?{?H?J?n?|8:?{?H?????|9:?????????|10:?????????|11:???
590
        //?|6:?{?H?????|7:?{?H?J?n?|8:?{?H?????|9:?????????|10:?????m?F?|11:???
591 591
        //?|12:?????????m?F?|13:?S????????m?F????
592 592
        //?|14:???U?[?u?|15:???U?[?u?|16:????C?H???|17:Hit'sV?H??
593 593
        private static bool[,] FieldCheckMap = new bool[,] {
......
644 644
                        {false, false, true,  false, false, false, true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 50:?_??H??????
645 645
                        {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 51:???????(???g?b?v)
646 646
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 52:?????????J?n??
647
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 53:??????????
647
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 53:?????m?F??
648 648
                        {false, false, true,  false, true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 54:?J?n?\???
649 649
                        {true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 55:?c??S??????
650 650
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 56:??Z????m?F?\????
......
680 680

  
681 681
        };
682 682
        //?@0:???????|1:?????o?|2:????C?H???|3:?? ?? ???|4:??|5:???????p
683
        //?|6:?{?H?????|7:?{?H?J?n?|8:?{?H?????|9:?????????|10:?????????|11:???
683
        //?|6:?{?H?????|7:?{?H?J?n?|8:?{?H?????|9:?????????|10:?????m?F?|11:???
684 684
        //?|12:?????????m?F?|13:?S????????m?F????
685 685
        //?|14:???U?[?u?|15:???U?[?u?|16:????C?H???|17:Hit'sV?H??
686 686
        #endregion
......
690 690
        /// ?t?B?[???h???b?N?p?}?b?v
691 691
        /// </summary>
692 692
        //  0:???????|1:?????o?|2:????C?H???|3:????|4:??|5:???????p
693
        //?|6:?{?H?????|7:?{?H?J?n?|8:?{?H?????|9:?????????|10:?????????|11:???
693
        //?|6:?{?H?????|7:?{?H?J?n?|8:?{?H?????|9:?????????|10:?????m?F?|11:???
694 694
        //?|12:?????????m?F?|13:?S????????m?F????
695 695
        //?|14:???U?[?u?|15:???U?[?u?|16:????C?H???|17:Hit'sV?H??
696 696
        private static bool[,] FieldLockMap = new bool[,]{
......
747 747
                        { false, false, true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false,  true,  true},    // 50:?_??H??????
748 748
                        { true,  true,  false, true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false},    // 51:?H??????g?b?v??
749 749
                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 52:?????????J?n??
750
                        { false, false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false},    // 53:??????????
750
                        { false, false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false},    // 53:?????m?F??
751 751
                        { true,   true,  true,  true,  true, false, false, false, false, false, false, false, false, false, false, false,  true,  true},    // 54:?J?n?\???
752 752
 
753 753
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 55:?c??S??????
......
791 791
                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false}};   // ?y??I?z+ 7:?H???????????????
792 792

  
793 793
        //  0:???????|1:?????o?|2:????C?H???|3:????|4:??|5:???????p
794
        //?|6:?{?H?????|7:?{?H?J?n?|8:?{?H?????|9:?????????|10:?????????|11:???
794
        //?|6:?{?H?????|7:?{?H?J?n?|8:?{?H?????|9:?????????|10:?????m?F?|11:???
795 795
        //?|12:?????????m?F?|13:?S????????m?F????
796 796
        //?|14:???U?[?u?|15:???U?[?u?|16:????C?H???|17:Hit'sV?H??
797 797
        #endregion
......
1376 1376
                // ?V?Z?L?????e?B?f?[?^??????????m?F????
1377 1377
                if (CommonMotions.LoginUserData.SecCode == 0)
1378 1378
                {
1379
                    // ?????????O????????????????
1379
                    // ?????????O??????m?F???????
1380 1380
                    if ((CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key) ||
1381 1381
                        (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement))
1382 1382
                    {
......
1386 1386
                }
1387 1387
                else
1388 1388
                {
1389
                    // ?????????O????????????????
1389
                    // ?????????O??????m?F???????
1390 1390
                    if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
1391 1391
                        || (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.SpecialAuthority].Key))
1392 1392
                    {
......
2016 2016
        }
2017 2017
        #endregion
2018 2018

  
2019
        #region ?????????????{?^??????
2019
        #region ?????m?F?????{?^??????
2020 2020
        /// <summary>
2021
        /// ?????????????{?^??????
2021
        /// ?????m?F?????{?^??????
2022 2022
        /// </summary>
2023 2023
        /// <param name="sender"></param>
2024 2024
        /// <param name="e"></param>
2025 2025
        private void btnRestore_Click(object sender, EventArgs e)
2026 2026
        {
2027
            // ????????????O????????
2027
            // ?????m?F????O????????
2028 2028
            if (!rdbStatus10.Checked) return;
2029 2029

  
2030
            if (MessageBox.Show("??????????????????X??????B",
2030
            if (MessageBox.Show("?????m?F??????????X??????B",
2031 2031
                                "????X?m?F",
2032 2032
                                MessageBoxButtons.OKCancel,
2033 2033
                                MessageBoxIcon.Information) == DialogResult.Cancel) return;
......
2035 2035
            // ????X
2036 2036
            BillingStatusChage();
2037 2037

  
2038
            CommonMotions.EntryEndMessage("????????????", "??X");
2038
            CommonMotions.EntryEndMessage("?????m?F????", "??X");
2039 2039
            
2040 2040
            this.Close();
2041 2041
        }
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.designer.cs
78 78
            this.txtInput07 = new System.Windows.Forms.TextBox();
79 79
            this.label6 = new System.Windows.Forms.Label();
80 80
            this.label8 = new System.Windows.Forms.Label();
81
            this.comboBoxEX1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
82
            this.cmbDisplayPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
81 83
            this.label4 = new System.Windows.Forms.Label();
82 84
            this.panel2 = new System.Windows.Forms.Panel();
83 85
            this.rdbEstimateType2 = new System.Windows.Forms.RadioButton();
84 86
            this.rdbEstimateType3 = new System.Windows.Forms.RadioButton();
85 87
            this.rdbEstimateType1 = new System.Windows.Forms.RadioButton();
88
            this.cmbConstructionType = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
86 89
            this.txtInput08 = new System.Windows.Forms.TextBox();
87 90
            this.btnSerchZip = new System.Windows.Forms.Button();
88 91
            this.label20 = new System.Windows.Forms.Label();
......
115 118
            this.label44 = new System.Windows.Forms.Label();
116 119
            this.label14 = new System.Windows.Forms.Label();
117 120
            this.label5 = new System.Windows.Forms.Label();
121
            this.cmbOrdersDivision = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
118 122
            this.btnOrderer = new System.Windows.Forms.Button();
123
            this.cmbDisplayOrderers = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
119 124
            this.txtInput05 = new System.Windows.Forms.TextBox();
120 125
            this.panel4 = new System.Windows.Forms.Panel();
121 126
            this.label101 = new System.Windows.Forms.Label();
......
124 129
            this.label97 = new System.Windows.Forms.Label();
125 130
            this.label39 = new System.Windows.Forms.Label();
126 131
            this.label30 = new System.Windows.Forms.Label();
132
            this.txtInput28 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
127 133
            this.label27 = new System.Windows.Forms.Label();
134
            this.txtInput25 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
128 135
            this.lblTransferDate = new System.Windows.Forms.Label();
129 136
            this.label36 = new System.Windows.Forms.Label();
137
            this.cmbTransferConstruction = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
130 138
            this.txtInput26 = new System.Windows.Forms.TextBox();
131 139
            this.label10 = new System.Windows.Forms.Label();
132 140
            this.txtInput01 = new System.Windows.Forms.TextBox();
133 141
            this.label33 = new System.Windows.Forms.Label();
142
            this.txtInput27 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
143
            this.txtInput02 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
134 144
            this.label24 = new System.Windows.Forms.Label();
145
            this.txtInput06 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
135 146
            this.label22 = new System.Windows.Forms.Label();
147
            this.txtInput12 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
136 148
            this.label12 = new System.Windows.Forms.Label();
149
            this.txtInput13 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
137 150
            this.label15 = new System.Windows.Forms.Label();
138 151
            this.label38 = new System.Windows.Forms.Label();
139 152
            this.label68 = new System.Windows.Forms.Label();
......
144 157
            this.label23 = new System.Windows.Forms.Label();
145 158
            this.label70 = new System.Windows.Forms.Label();
146 159
            this.label71 = new System.Windows.Forms.Label();
160
            this.textBoxEX2 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
161
            this.textBoxEX1 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
162
            this.txtInput03 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
147 163
            this.label62 = new System.Windows.Forms.Label();
148 164
            this.label72 = new System.Windows.Forms.Label();
149 165
            this.label73 = new System.Windows.Forms.Label();
150 166
            this.label61 = new System.Windows.Forms.Label();
151 167
            this.label55 = new System.Windows.Forms.Label();
168
            this.txtInput38 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
152 169
            this.label54 = new System.Windows.Forms.Label();
170
            this.txtInput34 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
153 171
            this.label66 = new System.Windows.Forms.Label();
154 172
            this.label56 = new System.Windows.Forms.Label();
155 173
            this.label75 = new System.Windows.Forms.Label();
......
168 186
            this.btnFluctuation = new System.Windows.Forms.Button();
169 187
            this.rdbExistsFluctuation = new System.Windows.Forms.RadioButton();
170 188
            this.rdbNotFluctuation = new System.Windows.Forms.RadioButton();
189
            this.comboBoxEX4 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
190
            this.comboBoxEX3 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
191
            this.cmbDisplayConstrSubPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
171 192
            this.label46 = new System.Windows.Forms.Label();
172 193
            this.txtInput32 = new System.Windows.Forms.TextBox();
173 194
            this.label47 = new System.Windows.Forms.Label();
......
175 196
            this.txtInput31 = new System.Windows.Forms.TextBox();
176 197
            this.label41 = new System.Windows.Forms.Label();
177 198
            this.label50 = new System.Windows.Forms.Label();
199
            this.label88 = new System.Windows.Forms.Label();
200
            this.textBoxEX3 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
201
            this.textBoxEX7 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
202
            this.txtInput35 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
178 203
            this.label25 = new System.Windows.Forms.Label();
204
            this.txtInput04 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
179 205
            this.label42 = new System.Windows.Forms.Label();
206
            this.textBoxEX5 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
207
            this.textBoxEX4 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
208
            this.txtInput29 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
209
            this.txtInput30 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
180 210
            this.label81 = new System.Windows.Forms.Label();
181 211
            this.label82 = new System.Windows.Forms.Label();
182 212
            this.label77 = new System.Windows.Forms.Label();
......
185 215
            this.label67 = new System.Windows.Forms.Label();
186 216
            this.label79 = new System.Windows.Forms.Label();
187 217
            this.label31 = new System.Windows.Forms.Label();
218
            this.cmbConstructionInstructor = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
219
            this.comboBoxEX2 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
220
            this.cmbDisplayConstructionPerson = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
188 221
            this.label113 = new System.Windows.Forms.Label();
189 222
            this.label76 = new System.Windows.Forms.Label();
190 223
            this.label112 = new System.Windows.Forms.Label();
......
238 271
            this.label89 = new System.Windows.Forms.Label();
239 272
            this.label129 = new System.Windows.Forms.Label();
240 273
            this.label125 = new System.Windows.Forms.Label();
274
            this.textBoxEX9 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
275
            this.textBoxEX8 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
276
            this.textBoxEX6 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
241 277
            this.label126 = new System.Windows.Forms.Label();
242 278
            this.label87 = new System.Windows.Forms.Label();
243 279
            this.label86 = new System.Windows.Forms.Label();
244
            this.label88 = new System.Windows.Forms.Label();
245 280
            this.label60 = new System.Windows.Forms.Label();
281
            this.txtInput36 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
246 282
            this.label127 = new System.Windows.Forms.Label();
247 283
            this.textBox2 = new System.Windows.Forms.TextBox();
248 284
            this.label128 = new System.Windows.Forms.Label();
......
250 286
            this.label29 = new System.Windows.Forms.Label();
251 287
            this.lblLastUpdate = new System.Windows.Forms.Label();
252 288
            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
289
            this.cmbConstructionYear = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
290
            this.cmbConstructionPeriod = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
253 291
            this.btnOtherProc = new System.Windows.Forms.Button();
254 292
            this.lblJointLabel = new System.Windows.Forms.Label();
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

他の形式にエクスポート: Unified diff