プロジェクト

全般

プロフィール

リビジョン 321

堀内ほぼ7年前に追加

工事情報入力:検査予定日:検査実行日入力エラーチェック追加
       検査是正完了日:入力タイミング修正
掲示板読込:書込み者が部署の場合担当者名を表示
掲示板書込:修正時書込み者がログイン者になる不具合を修正

差分を表示:

branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
14 14
        /// <summary>
15 15
        /// 本体バージョン
16 16
        /// </summary>
17
        public static int s_SystemVersion = 145;
17
        public static int s_SystemVersion = 146;
18 18

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
480 480
                                                                        new KeyValuePair<int, string>(79,"?w????????"),
481 481
                                                                        new KeyValuePair<int, string>(80,"?H?????S????R?[?h"),
482 482
                                                                        new KeyValuePair<int, string>(81,"?H???????????????"),
483
                                                                        new KeyValuePair<int, string>(82,"??????????")};
483
                                                                        new KeyValuePair<int, string>(82,"??????????"),
484
                                                                        new KeyValuePair<int, string>(83,"?????\???"),
485
                                                                        new KeyValuePair<int, string>(84,"???????s??"),
486
                                                                        new KeyValuePair<int, string>(85,",??????????????") };
484 487
        #endregion
485 488

  
486 489
        #region ?R???{?{?b?N?X?f?[?^?J????
......
586 589
        /// <summary>
587 590
        /// ?K?{????`?F?b?N?p?}?b?v
588 591
        /// </summary>
589
        //?@0:???????|1:?????o?|2:????C?H???|3:?? ?? ???|4:??|5:???????p
590
        //?|6:?{?H?????|7:?{?H?J?n?|8:?{?H?????|9:?????????|10:?????m?F?|11:???
592
        //  0:??????
593
        //?|1:?????o
594
        //?|2:????C?H??
595
        //?|3:????
596
        //?|4:??
597
        //?|5:???????p
598
        //?|6:?{?H????
599
        //?|7:?{?H?J?n
600
        //?|8:?{?H????
601
        //?|9:????????
602
        //?|10:?????m?F
603
        // ?|11:???
591 604
        //?|12:?????????m?F?|13:?S????????m?F????
592 605
        //?|14:???U?[?u?|15:???U?[?u?|16:????C?H???|17:Hit'sV?H??
593 606
        private static bool[,] FieldCheckMap = new bool[,] {
607
                        //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
594 608
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     //  0:?H???R?[?h
595 609
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     //  1:?H???N?x
596 610
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     //  2:?H????
......
622 636
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 28:?H???T?v?S
623 637
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 29:?H???T?v?T
624 638
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 30:?x???i?P
639

  
640
                        //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
625 641
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 31:?x???i?Q
626 642
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 32:??r?H???P
627 643
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 33:??r?H???Q
......
652 668
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 58:??Z?\?Z?m?F?\????
653 669
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 59:??Z?\?Z???F??
654 670
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 60:?????
671

  
672
                        //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
655 673
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 61:????
656 674
                        {false, false, true,  false, false, false, false, true,  true,  true,  true,  false, false, false, false, false,  true,  true},     // 62:?H???S??????
657 675
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 63:?_??H???J?n?i???????j
......
674 692
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 80:?H?????S????R?[?h
675 693
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 81:?H???????????????
676 694
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 82:??????????
677
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 83:?????\???
678
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 84:???????s??
695
                        {false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false},     // 83:?????\???
696
                        {false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},     // 84:???????s??
679 697
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 85:??????????????
680 698

  
681 699
        };
682
        //?@0:???????|1:?????o?|2:????C?H???|3:?? ?? ???|4:??|5:???????p
683
        //?|6:?{?H?????|7:?{?H?J?n?|8:?{?H?????|9:?????????|10:?????m?F?|11:???
684
        //?|12:?????????m?F?|13:?S????????m?F????
685
        //?|14:???U?[?u?|15:???U?[?u?|16:????C?H???|17:Hit'sV?H??
686 700
        #endregion
687 701

  
688 702
        #region ?t?B?[???h???b?N?p?}?b?v
689 703
        /// <summary>
690 704
        /// ?t?B?[???h???b?N?p?}?b?v
691 705
        /// </summary>
692
        //  0:???????|1:?????o?|2:????C?H???|3:????|4:??|5:???????p
693
        //?|6:?{?H?????|7:?{?H?J?n?|8:?{?H?????|9:?????????|10:?????m?F?|11:???
706
        //  0:??????
707
        //?|1:?????o
708
        //?|2:????C?H??
709
        //?|3:????
710
        //?|4:??
711
        //?|5:???????p
712
        //?|6:?{?H????
713
        //?|7:?{?H?J?n
714
        //?|8:?{?H????
715
        //?|9:????????
716
        //?|10:?????m?F
717
        // ?|11:???
694 718
        //?|12:?????????m?F?|13:?S????????m?F????
695 719
        //?|14:???U?[?u?|15:???U?[?u?|16:????C?H???|17:Hit'sV?H??
696 720
        private static bool[,] FieldLockMap = new bool[,]{
721
                        //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
697 722
                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    //  0:?H???R?[?h?i???x???j
698 723
                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    //  1:?H???N?x ?i??\???j
699 724
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    //  2:?H????
......
725 750
                        { true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 28:?H???T?v?S
726 751
                        { true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 29:?H???T?v?T
727 752
                        { true,  true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false, false, false, false},    // 30:?x???i?P
753

  
754
                        //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
728 755
                        { true,  true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false, false, false, false},    // 31:?x???i?Q
729 756
                        { true,  true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false, false, false, false},    // 32:??r?H???P
730 757
                        { true,  true,  false, true,  true,  true,  true,  false, false, false, false, false, false, false, false, false, false, false},    // 33:??r?H???Q
......
749 776
                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 52:?????????J?n??
750 777
                        { false, false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false},    // 53:?????m?F??
751 778
                        { true,   true,  true,  true,  true, false, false, false, false, false, false, false, false, false, false, false,  true,  true},    // 54:?J?n?\???
752
 
753 779
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 55:?c??S??????
754 780
                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 56:??Z????m?F?\????
755 781
                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 57:??Z??????F??
756 782
                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 58:??Z?\?Z?m?F?\????
757 783
                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 59:??Z?\?Z???F??
758 784
                        { false, false, false, true,  true,  false, false, false, false, false, false, false, false, false, false, false, false, false},    // 60:?????
785

  
786
                        //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
759 787
                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 61:????
760 788
                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},    // 62:?H???S??????
761 789
                        { false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false, false, false, false},    // 63:?_??H???J?n?i???????j
......
782 810
                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 84:???????s??
783 811
                        { false, false, false, false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false},    // 85:??????????????
784 812

  
813
                        //  0      1      2      3      4      5      6      7      8      9     10      11     12     13     14     15     16     17
785 814
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // ?y??I?z+ 1:?????t???O
786 815
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // ?y??I?z+ 2:?????t???O ?????g?p
787 816
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // ?y??I?z+ 3:?c??o?????t???O
......
1373 1402
                // ?????????{?^???\??
1374 1403
                DispbtnRestore();
1375 1404

  
1376
                // ?V?Z?L?????e?B?f?[?^??????????m?F????
1377
                if (CommonMotions.LoginUserData.SecCode == 0)
1405
                // ?????????O??????m?F???????
1406
                int nRankCode = (int)CommonDefine.SecurityRankPos.SpecialAuthority;
1407
                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
1408
                    || (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[nRankCode].Key))
1378 1409
                {
1379
                    // ?????????O??????m?F???????
1380
                    if ((CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key) ||
1381
                        (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement))
1382
                    {
1383
                        // ????O
1384
                        if (!rdbStatus3.Checked) rdbStatus10.Enabled = true;
1385
                    }
1410
                    // ????O
1411
                    if (!rdbStatus3.Checked) rdbStatus10.Enabled = true;
1386 1412
                }
1387
                else
1388
                {
1389
                    // ?????????O??????m?F???????
1390
                    if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
1391
                        || (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.SpecialAuthority].Key))
1392
                    {
1393
                        // ????O
1394
                        if (!rdbStatus3.Checked) rdbStatus10.Enabled = true;
1395
                    }
1396
                }
1397 1413

  
1398 1414
                // *-----* ????????{?^????? *-----*
1399 1415
                CreateProcessContextMenu(m_SubForm);
1400 1416
                // *-----* ????????{?^????? *-----*
1401 1417

  
1402

  
1403 1418
                // ?????t?H?[?J?X
1404 1419
                this.ActiveControl = m_DspCtrl[(int)DspCnt.ConstructionPeriod];
1405 1420

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
470 470
                    iNGno = (int)DspCnt.EndDate;
471 471
                }
472 472

  
473
                //// ???????X????
474
                //if (m_DspCtrl[(int)DspCnt.PurchaseOrderMailingDate].Text.Length != 0) iLength++;
475
                //bPara = FieldCheckMap[(int)DspCnt.PurchaseOrderMailingDate, iStatusCount];
476
                //if (!CommonMotions.DispFieldDateCheck(m_DspCtrl[(int)DspCnt.PurchaseOrderMailingDate], bPara))
477
                //    iNGno = (int)DspCnt.PurchaseOrderMailingDate;
478

  
479
                //// ???????????
480
                //if (m_DspCtrl[(int)DspCnt.PurchaseOrderReturnDate].Text.Length != 0) iLength++;
481
                //bPara = FieldCheckMap[(int)DspCnt.PurchaseOrderReturnDate, iStatusCount];
482
                //if (!CommonMotions.DispFieldDateCheck(m_DspCtrl[(int)DspCnt.PurchaseOrderReturnDate], bPara))
483
                //    iNGno = (int)DspCnt.PurchaseOrderReturnDate;
484

  
485
                //// ??????????m?F??
486
                //if (m_DspCtrl[(int)DspCnt.PurchaseOrderReturnCheckDate].Text.Length != 0) iLength++;
487
                //bPara = FieldCheckMap[(int)DspCnt.PurchaseOrderReturnCheckDate, iStatusCount];
488
                //if (!CommonMotions.DispFieldDateCheck(m_DspCtrl[(int)DspCnt.PurchaseOrderReturnCheckDate], bPara))
489
                //    iNGno = (int)DspCnt.PurchaseOrderReturnCheckDate;
490

  
491 473
                // ?H???T?v?P
492 474
                if (m_DspCtrl[(int)DspCnt.Overview1].Text.Length != 0) iLength++;
493 475
                if (!CommonMotions.DispFieldLengthCheck(m_DspCtrl[(int)DspCnt.Overview1], s_OverviewLength, true))
......
565 547
                if (!CommonMotions.DispFieldDateCheck(m_DspCtrl[(int)DspCnt.BillingComplateDate], bPara))
566 548
                    iNGno = (int)DspCnt.BillingComplateDate;
567 549

  
568
                //// ???????X????
569
                //if (m_DspCtrl[(int)DspCnt.BillingSendDate].Text.Length != 0) iLength++;
570
                //bPara = FieldCheckMap[(int)DspCnt.BillingSendDate, iStatusCount];
571
                //if (!CommonMotions.DispFieldDateCheck(m_DspCtrl[(int)DspCnt.BillingSendDate], bPara))
572
                //    iNGno = (int)DspCnt.BillingSendDate;
550
                // ?????\???
551
                if (m_DspCtrl[(int)DspCnt.InspectPlanningDate].Text.Length != 0) iLength++;
552
                bPara = FieldCheckMap[(int)DspCnt.InspectPlanningDate, iStatusCount];
553
                if (!CommonMotions.DispFieldDateCheck(m_DspCtrl[(int)DspCnt.InspectPlanningDate], bPara))
554
                    iNGno = (int)DspCnt.InspectPlanningDate;
573 555

  
556
                // ???????s??
557
                if (m_DspCtrl[(int)DspCnt.InspectExecuteDate].Text.Length != 0) iLength++;
558
                bPara = FieldCheckMap[(int)DspCnt.InspectExecuteDate, iStatusCount];
559
                if (!CommonMotions.DispFieldDateCheck(m_DspCtrl[(int)DspCnt.InspectExecuteDate], bPara))
560
                    iNGno = (int)DspCnt.InspectExecuteDate;
561

  
562
                // ??????????????
563
                if (m_DspCtrl[(int)DspCnt.RevCompleteDate].Text.Length != 0) iLength++;
564
                bPara = FieldCheckMap[(int)DspCnt.RevCompleteDate, iStatusCount];
565
                if (!CommonMotions.DispFieldDateCheck(m_DspCtrl[(int)DspCnt.RevCompleteDate], bPara))
566
                    iNGno = (int)DspCnt.RevCompleteDate;
567

  
574 568
                if (iLength == 0)
575 569
                {
576 570
                    MessageBox.Show("?f?[?^????????????????A?m?F????????????B", "?f?[?^?m?F", MessageBoxButtons.OK, MessageBoxIcon.Warning);
......
5008 5002
                {
5009 5003
                    btnRestore.Enabled = true;
5010 5004
                    btnRestore.Visible = true;
5005
                    m_DspCtrl[(int)DspCnt.RevCompleteDate].Enabled = true;  // 85:??????????????
5011 5006
                }
5012 5007
                // ??????????`?F?b?N?????{?^??????????\??(?V?K????\???????)
5013 5008
                if (m_ConstructionCode > 0) btnPA.Visible = true;
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardReader.cs
333 333
            try
334 334
            {
335 335
                // 掲示板データを取得する
336
                string strSQL = mbdDB.CreatePrimarykeyString(m_RecordNumber, m_BranchNumber);
336
                StringBuilder strSQL = new StringBuilder();
337
                strSQL.Append(mbdDB.CreatePrimarykeyString(m_RecordNumber, m_BranchNumber));
337 338
                MessageBoardData data = new MessageBoardData();
338
                if (!mbdDB.SelectAction(strSQL, ref data)) return;
339
                if (!mbdDB.SelectAction(strSQL.ToString(), ref data)) return;
339 340

  
340 341
                lblTitle.Text = data.MessageTitle;          // タイトル
341 342
                lblWriter.Text = data.FromName;             // 書込み者
343
                // 部署からの書込みは担当者名を表示する
344
                if (data.FromCode < 99999)
345
                {
346
                    strSQL.Clear();
347
                    strSQL.Append("Select PersonCode, PersonName From personinchargemaster");
348
                    strSQL.AppendFormat(" Where PersonCode = {0}", data.PersonCode);
349
                    ArrayList NameData = new ArrayList();
350
                    mbdDB.ExecuteReader(strSQL.ToString(), ref NameData);
351
                    if (NameData.Count > 0)
352
                    {
353
                        object[] objRec = (object[])NameData[0];
354
                        // 書込み者セット
355
                        lblWriter.Text = string.Format("{0} : {1}", data.FromName, CommonMotions.cnvString(objRec[1]));
356
                    }
357
                }
342 358

  
343 359
                //  対象者名表示
344 360
                string strTergetSQL = mbtDB.CreatePrimarykeyString(data.RecordNumber, data.BranchNumber) + " Order By SeqNum";
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardWriter.cs
364 364
        }
365 365
        #endregion
366 366

  
367
        #region プライベートメソッド
367
        #region 初期表示処理
368 368
        /// <summary>
369 369
        /// 初期表示処理
370 370
        /// </summary>
......
397 397
                MessageBoardData data = new MessageBoardData();
398 398
                if (!mbdDB.SelectAction(strSQL, ref data)) return;
399 399

  
400
                // 書込み者セット
401
                cmbWriter.SelectedValue = data.FromCode;
402

  
400 403
                // 編集時
401 404
                if (data.PersonCode == CommonMotions.LoginUserData.PersonCode)
402 405
                {
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
32 32
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
33 33
// 既定値にすることができます:
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.1.145")]
36
[assembly: AssemblyFileVersion("1.0.1.145")]
35
[assembly: AssemblyVersion("1.0.1.146")]
36
[assembly: AssemblyFileVersion("1.0.1.146")]
37 37
// Log4netを使用する
38 38
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

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