プロジェクト

全般

プロフィール

リビジョン 267

堀内7年以上前に追加

StringBuilder化追加
工事情報の検索機能追加
Commondefineのテーブル区分等をDataModelへ移動

差分を表示:

branches/src/DataCheckExcute/DataCheckExcute/Common/Process/ClsChangeLedgerData.cs
208 208
                    List<ConstructionLedgerDetail> DetailList = new List<ConstructionLedgerDetail>();
209 209
                    DetailSQL.Clear();
210 210
                    DetailSQL.Append(LedgerDeDB.CreatePrimarykeyString(LedgerRec.ConstructionCode));
211
                    DetailSQL.AppendFormat(" AND OperatingFlg = {0}", (int)CommonDefine.SalaryOperateKind.Oparateing);  // 対応中フラグ
212
                    DetailSQL.AppendFormat(" AND SALARYFLG != {0}", (int)CommonDefine.SalaryDevision.Noting);           // 給与振分区分
211
                    DetailSQL.AppendFormat(" AND OperatingFlg = {0}", (int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing);      // 対応中フラグ
212
                    DetailSQL.AppendFormat(" AND SALARYFLG != {0}", (int)CommonDefine.SalaryDevision.Noting);                       // 給与振分区分
213 213
                    DetailSQL.AppendFormat(" AND GROUPCOUNT IN ({0},{1},{2})",
214 214
                                                                    (int)FrmConstructionLedger.DataGroup.Instructor,        // 指導員給料
215 215
                                                                    (int)FrmConstructionLedger.DataGroup.Assistant,         // 副担当者給料
......
228 228
                        // コードがない場合は処理しない
229 229
                        if (CurRec.CompanyCode == 0) continue;
230 230
                        // 施工管理中担当者ではない場合は処理しない
231
                        if (CurRec.OperatingFlg == (int)CommonDefine.SalaryOperateKind.Complate) continue;
231
                        if (CurRec.OperatingFlg == (int)ConstructionLedgerDetail.SalOpeKindDef.Complate) continue;
232 232

  
233 233
                        // セットする金額を計算する
234 234
                        switch (CurRec.SalaryFlg)
branches/src/DataCheckExcute/DataCheckExcute/Common/Process/ClsSystemOnceExecute.cs
276 276
                // 当日のチェック 今日を基準に対象日と比較する
277 277
                if (Target.Date == CriteriaDate.Date)
278 278
                {
279
                    TermMasterData.CheckSchdule = (int)CommonDefine.TermDateCheckTiming.CheckSchdule1;
279
                    TermMasterData.CheckSchdule = (int)TermMaster.TermDateCheckTimingDef.CheckSchdule1;
280 280
                    TermMasterData.TermDays     = CommonDefine.MaterualStatusCheckList[0].Value;
281 281
                    TermMasterData.SendTitle    = CommonDefine.MaterualLimitItem[0, 0];
282 282
                    TermMasterData.SendMessage  = CommonDefine.MaterualLimitItem[0, 1];
......
286 286
                // 後日以降継続のチェック 今日を基準に経過日(1日)が過ぎているか比較する
287 287
                else if (Target.AddDays(1).Date <= CriteriaDate.Date)
288 288
                {
289
                    TermMasterData.CheckSchdule = (int)CommonDefine.TermDateCheckTiming.CheckSchdule3;
289
                    TermMasterData.CheckSchdule = (int)TermMaster.TermDateCheckTimingDef.CheckSchdule3;
290 290
                    TermMasterData.TermDays     = CommonDefine.MaterualStatusCheckList[1].Value;
291 291
                    TermMasterData.SendTitle    = CommonDefine.MaterualLimitItem[1, 0];
292 292
                    TermMasterData.SendMessage  = CommonDefine.MaterualLimitItem[1, 1];
......
303 303
        }
304 304
        #endregion
305 305

  
306
        #region 秘書からのメッセージ作成
306
        #region 秘書からのメッセージ作成(資材管理)
307 307
        /// <summary>
308
        /// 秘書からのメッセージ作成
308
        /// 秘書からのメッセージ作成(資材管理)
309 309
        /// </summary>
310 310
        private bool MakeSecretaryMassageData(IOMessageBoardData mbdDB,
311 311
                                        IOMessageBoardTerget mbtDB,
......
320 320
                strSQL += string.Format(" LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = {0}", wrkRec.PersonCode);
321 321
                strSQL += " , CONSTRUCTIONBASEINFODETAIL A";
322 322
                strSQL += string.Format(" WHERE P.CONSTRUCTIONCODE = {0}", wrkRec.ConstructionCode);
323
                strSQL += string.Format(" AND A.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE AND A.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
323
                strSQL += string.Format(" AND A.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE AND A.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
324 324
                ArrayList arList = new ArrayList();
325 325
                if (!cbiDB.ExecuteReader(strSQL, ref arList)) return false;
326 326

  
......
560 560
                    {
561 561
                        List<TermMaster> term = new List<TermMaster>();
562 562
                        // 増減工事の子は処理しない
563
                        if (wrkRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Tying) continue;
563
                        if (wrkRec.TyingFlg == (int)ConstructionBaseInfo.TyingFlgDef.Tying) continue;
564 564
                        // 結合工事の親は処理しない
565
                        if (wrkRec.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinParent) continue;
565
                        if (wrkRec.JoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.JoinParent) continue;
566 566
                        // 結合工事の子は処理しない
567
                        if (wrkRec.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinChildren) continue;
567
                        if (wrkRec.JoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.JoinChildren) continue;
568 568
                        // チェックOKならば次のデータ
569 569
                        if (ConstructionStatusCheck(wrkRec, CriteriaDate, ref term)) continue;
570 570

  
......
653 653

  
654 654
                    switch (wrkCheck.FieldNo)
655 655
                    {
656
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.RequestedDate:               // 依頼受け日
656
                        case (int)ConstructionBaseInfo.DateNoDef.RequestedDate:               // 依頼受け日
657 657
                            Target = checkRec.RequestedDate;
658 658
                            break;
659
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.EstimatesSubmitDeadline:     // 見積提出期限
659
                        case (int)ConstructionBaseInfo.DateNoDef.EstimatesSubmitDeadline:     // 見積提出期限
660 660
                            Target = checkRec.EstimatesSubmitDeadline;
661 661
                            break;
662
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.EstimatesSubmittedDate:      // 見積提出日
662
                        case (int)ConstructionBaseInfo.DateNoDef.EstimatesSubmittedDate:      // 見積提出日
663 663
                            Target = checkRec.EstimatesSubmittedDate;
664 664
                            break;
665
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.OrderDate:                   // 受注日
665
                        case (int)ConstructionBaseInfo.DateNoDef.OrderDate:                   // 受注日
666 666
                            Target = checkRec.OrderDate;
667 667
                            break;
668
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.OrderStartingDate:           // 開始予定日
668
                        case (int)ConstructionBaseInfo.DateNoDef.OrderStartingDate:           // 開始予定日
669 669
                            Target = checkRec.OrderStartingDate;
670 670
                            break;
671
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.OrderCompletionDate:         // 完了予定日
671
                        case (int)ConstructionBaseInfo.DateNoDef.OrderCompletionDate:         // 完了予定日
672 672
                            Target = checkRec.OrderCompletionDate;
673 673
                            break;
674
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.ConstrPreparationDate:       // 施工開始準備日
674
                        case (int)ConstructionBaseInfo.DateNoDef.ConstrPreparationDate:       // 施工開始準備日
675 675
                            Target = checkRec.PreparationStartDate;
676 676
                            break;
677
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.ConstructionStartingDate:    // 施工開始日
677
                        case (int)ConstructionBaseInfo.DateNoDef.ConstructionStartingDate:    // 施工開始日
678 678
                            Target = checkRec.ConstructionStartingDate;
679 679
                            break;
680
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.ConstructionCompletionDate:  // 施工完了日
680
                        case (int)ConstructionBaseInfo.DateNoDef.ConstructionCompletionDate:  // 施工完了日
681 681
                            Target = checkRec.ConstructionCompletionDate;
682 682
                            break;
683
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.TransferConstructionDate:    // 工事移管日
683
                        case (int)ConstructionBaseInfo.DateNoDef.TransferConstructionDate:    // 工事移管日
684 684
                            Target = checkRec.TransferConstructionDate;
685 685
                            break;
686
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.EstimatesExpirationDate:     // 見積有効期限
686
                        case (int)ConstructionBaseInfo.DateNoDef.EstimatesExpirationDate:     // 見積有効期限
687 687
                            Target = checkRec.EstimatesExpirationDate;
688 688
                            break;
689
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.ConstructionPeriodStart:     // 契約工期開始
689
                        case (int)ConstructionBaseInfo.DateNoDef.ConstructionPeriodStart:     // 契約工期開始
690 690
                            Target = checkRec.ConstructionPeriodStart;
691 691
                            break;
692
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.ConstructionPeriodEnd:       // 契約工期完了
692
                        case (int)ConstructionBaseInfo.DateNoDef.ConstructionPeriodEnd:       // 契約工期完了
693 693
                            Target = checkRec.ConstructionPeriodEnd;
694 694
                            // 延長工期があれば延長工期を入れる
695 695
                            if (checkRec.ConstructionPeriodEnd2 != DateTime.MinValue) Target = checkRec.ConstructionPeriodEnd2;
696 696
                            break;
697
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.BillingStartDate:            // 請求準備開始日
697
                        case (int)ConstructionBaseInfo.DateNoDef.BillingStartDate:            // 請求準備開始日
698 698
                            Target = checkRec.BillingStartDate;
699 699
                            break;
700
                        case (int)CommonDefine.ConstructionBaseInfo_DateNo.BillingDate:                 // 請求日
700
                        case (int)ConstructionBaseInfo.DateNoDef.BillingDate:                 // 請求日
701 701
                            Target = checkRec.BillingDate;
702 702
                            // 2016/10/06 台帳入力完了日があればチェックをしない 
703 703
                            if (checkRec.LedgerComplateDate != DateTime.MinValue) Target = DateTime.MinValue.Date;
......
712 712

  
713 713
                    switch (wrkCheck.CheckSchdule)
714 714
                    {
715
                        case (int)CommonDefine.TermDateCheckTiming.CheckSchdule0:   // 前日以前のチェック
715
                        case (int)TermMaster.TermDateCheckTimingDef.CheckSchdule0:   // 前日以前のチェック
716 716
                            // 今日を基準に経過日を加算して対象日と比較する
717 717
                            //if (Target.Date == DateTime.Now.AddDays(wrkCheck.TermDays).Date)
718 718
                            if (Target.Date == CriteriaDate.AddDays(wrkCheck.TermDays).Date)
......
720 720
                                ErrFlg = true;
721 721
                            }
722 722
                            break;
723
                        case (int)CommonDefine.TermDateCheckTiming.CheckSchdule1:   // 当日のチェック
723
                        case (int)TermMaster.TermDateCheckTimingDef.CheckSchdule1:   // 当日のチェック
724 724
                            // 今日を基準に対象日と比較する
725 725
                            //if (Target.Date == DateTime.Now.Date)
726 726
                            if (Target.Date == CriteriaDate.Date)
......
728 728
                                ErrFlg = true;
729 729
                            }
730 730
                            break;
731
                        case (int)CommonDefine.TermDateCheckTiming.CheckSchdule2:   // 後日以降のチェック
731
                        case (int)TermMaster.TermDateCheckTimingDef.CheckSchdule2:   // 後日以降のチェック
732 732
                            // 今日を基準に対象日と比較する
733 733
                            //if (Target.AddDays(wrkCheck.TermDays).Date == DateTime.Now.Date)
734 734
                            if (Target.AddDays(wrkCheck.TermDays).Date == CriteriaDate.Date)
......
736 736
                                ErrFlg = true;
737 737
                            }
738 738
                            break;
739
                        case (int)CommonDefine.TermDateCheckTiming.CheckSchdule3:   // 後日以降継続のチェック
739
                        case (int)TermMaster.TermDateCheckTimingDef.CheckSchdule3:   // 後日以降継続のチェック
740 740
                            // 今日を基準に経過日が過ぎているとエラー
741 741
                            //if (Target.AddDays(wrkCheck.TermDays).Date <= DateTime.Now.Date)
742 742
                            if (Target.AddDays(wrkCheck.TermDays).Date <= CriteriaDate.Date)
......
781 781
                strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = P.CONSTRUCTIONPERSONCODE");
782 782
                strSQL.Append(", CONSTRUCTIONBASEINFODETAIL A");
783 783
                strSQL.AppendFormat(" WHERE P.CONSTRUCTIONCODE = {0}",wrkRec.ConstructionCode);
784
                strSQL.AppendFormat(" AND A.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE AND A.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
784
                strSQL.AppendFormat(" AND A.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE AND A.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
785 785
                ArrayList arList = new ArrayList();
786 786
                if (!cbiDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
787 787
                
......
875 875
                strSQL.Append("SELECT A.CONSTRUCTIONCODE, B.DETAILSTRING");
876 876
                strSQL.Append(" FROM CONSTRUCTIONBASEINFO A");
877 877
                strSQL.Append(" LEFT JOIN CONSTRUCTIONBASEINFODETAIL B ON B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
878
                strSQL.AppendFormat(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.OrdersDecisionComment);
878
                strSQL.AppendFormat(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.OrdersDecisionComment);
879 879

  
880 880
                StringBuilder strWHERE = new StringBuilder();
881 881
                strWHERE.AppendFormat(" WHERE DATE(A.ESTIMATESSUBMITTEDDATE) != STR_TO_DATE('{0}', '%Y/%m/%d')", DateTime.MinValue);
882 882
                strWHERE.AppendFormat(" AND DATE(DATE_ADD(A.ESTIMATESSUBMITTEDDATE, INTERVAL '{0}' DAY))", s_NonOrderDay);
883 883
                strWHERE.AppendFormat(" < STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.Now.ToShortDateString());
884 884
                strWHERE.AppendFormat(" AND A.CONSTRUCTIONSTATUSFLG IN({0}, {1})", iCode2, iCode3);
885
                strWHERE.AppendFormat(" AND A.ESTIMATETYPE IN ({0}, {1})", (int)CommonDefine.BaseInfoEstimateType.Normal, (int)CommonDefine.BaseInfoEstimateType.GetBudget);
885
                strWHERE.AppendFormat(" AND A.ESTIMATETYPE IN ({0}, {1})", (int)ConstructionBaseInfo.EstimateTypeDef.Normal, (int)ConstructionBaseInfo.EstimateTypeDef.GetBudget);
886 886
                strSQL.Append(strWHERE.ToString());
887 887
                ArrayList arList = new ArrayList();
888 888
                if (!BaseDB.ExecuteReader(strSQL.ToString(), ref arList))
......
925 925
                                                    (int)IOConstructionBaseInfoDetail.TableColumn.DETAILSTRING,
926 926
                                                    strOrgMsg,
927 927
                                                    false,
928
                                                    (int)ConstructionBaseInfoDetail.DetailDataNo.OrdersDecisionComment))
928
                                                    (int)ConstructionBaseInfoDetail.DataNoDef.OrdersDecisionComment))
929 929
                        {
930 930
                            BaseDB.rollback();
931 931
                            DetailDB.rollback();
......
973 973
            {
974 974
                ConstructionBaseInfoDetail work = new ConstructionBaseInfoDetail();
975 975
                work.ConstructionCode = ConstrCode;
976
                work.DetailNo = (int)ConstructionBaseInfoDetail.DetailDataNo.OrdersDecisionComment;
976
                work.DetailNo = (int)ConstructionBaseInfoDetail.DataNoDef.OrdersDecisionComment;
977 977
                work.DetailString = strMsg;
978 978

  
979 979
                if (!DetailDB.InsertAction(work, false)) return false;
......
1003 1003

  
1004 1004
                // 入力完了以外を対象にする
1005 1005
                StringBuilder strSQL = new StringBuilder();
1006
                strSQL.AppendFormat(" A WHERE A.ComplateFlg <> {0}", (int)CommonDefine.ComplateTitleNo.Complated);
1006
                strSQL.AppendFormat(" A WHERE A.ComplateFlg <> {0}", (int)ConstructionLedger.CompFlagDef.Complated);
1007 1007
                strSQL.Append(" AND A.CONSTRUCTIONCODE IN (SELECT A1.CONSTRUCTIONCODE FROM CONSTRUCTIONBASEINFO A1");
1008 1008
                strSQL.AppendFormat(" WHERE A1.CONSTRUCTIONSTATUSFLG <> {0}", iCode1);
1009 1009
                strSQL.AppendFormat(" AND A1.CONSTRUCTIONSTATUSFLG <> {0}", iCode3);
branches/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs
11 11
using System.Security.Cryptography;
12 12
using System.Globalization;
13 13

  
14
using ProcessManagement.Common;
15
using ProcessManagement.DB.IOAccess;
16
using ProcessManagement.DataModel;
17
using ProcessManagement.DB.Core;
18

  
14 19
namespace ProcessManagement.Common
15 20
{
16 21
    /// <summary>
......
360 365
        }
361 366
        #endregion
362 367

  
363
        #region 担当者マスタ:社員区分
364
        /// <summary>
365
        /// 社員区分
366
        /// </summary>
367
        public enum EmployeeClassFlg
368
        {
369
            /// <summary>
370
            /// 不定
371
            /// </summary>
372
            None = 0,
373
            /// <summary>
374
            /// 正社員
375
            /// </summary>
376
            Regular,
377
            /// <summary>
378
            /// 外注者
379
            /// </summary>
380
            OutSource,
381
        }
382
        #endregion
383

  
384
        #region 法人格マスタ:法人格名称位置定義
385
        /// <summary>
386
        /// 法人格名称位置
387
        /// </summary>
388
        public enum StatusNamePoint
389
        {
390
            None = 0,
391
            Forword,
392
            Back,
393
        }
394
        #endregion
395

  
396
        #region 期限マスタ:日付チェックタイミング
397
        /// <summary>
398
        /// 期限マスタ:日付チェックタイミング
399
        /// </summary>
400
        public enum TermDateCheckTiming
401
        {
402
            /// <summary>
403
            /// 0:前日以前
404
            /// </summary>
405
            CheckSchdule0 = 0,
406
            /// <summary>
407
            /// 1:当日
408
            /// </summary>
409
            CheckSchdule1,
410
            /// <summary>
411
            /// 2:後日以降
412
            /// </summary>
413
            CheckSchdule2,
414
            /// <summary>
415
            /// 3:後日以降継続
416
            /// </summary>
417
            CheckSchdule3,
418
        }
419
        #endregion
420

  
421
        #region 期限マスタ:背景・文字色指定定義
422
        /// <summary>
423
        /// 色の使用場所指定
424
        /// </summary>
425
        public enum PalceOfColor
426
        {
427
            BackColor = 0,      // 背景色
428
            ForeColor,          // 文字色
429
            OtherColor,         // その他色
430
        }
431
        #endregion
432

  
433
        #region 工事種別マスタ:公共工事種別
434
        /// <summary>
435
        /// 工事種別マスタ:公共工事種別
436
        /// </summary>
437
        public enum ConstructionType
438
        {
439
            /// <summary>
440
            /// 0:その他
441
            /// </summary>
442
            Other = 0,
443
            /// <summary>
444
            /// 1:公共
445
            /// </summary>
446
            Community,
447
            /// <summary>
448
            /// 2:民間
449
            /// </summary>
450
            Popular,
451
        }
452
        #endregion
453

  
454 368
        #region 承認処理:承認状態
455 369
        /// <summary>
456 370
        /// 承認状態
......
518 432
                                                                                            };
519 433
        #endregion
520 434

  
521
        #region 管理マスタ:工事番号基準値
522
        /// <summary>
523
        /// 工事番号基準値 0:営業期数 1:工事年度
524
        /// </summary>
525
        public enum SystemConstructionNoBase
526
        {
527
            /// <summary>
528
            /// 0:営業期数
529
            /// </summary>
530
            BusinessPeriod = 0,
531
            /// <summary>
532
            /// 1:工事年度
533
            /// </summary>
534
            ConstructionYear,
535
        }
536
        #endregion
537

  
538 435
        #region 工事基本情報:施工案件状態定義
539 436
        #region 施工案件状態キー定義配列
540 437
        /// <summary>
......
721 618
        #endregion
722 619
        #endregion
723 620

  
724
        #region 工事基本情報:日付項目テーブル
725
        #region 旧データ
726
        //public static Dictionary<int, string> BaseInfoDateNameNo = new Dictionary<int, string>(){         2016/01/05 14:開始予定日追加->5:へ移動
727
        //                                                                            {1,"RequestedDate"},
728
        //                                                                            {2,"EstimatesSubmitDeadline"},
729
        //                                                                            {3,"EstimatesSubmittedDate"},
730
        //                                                                            {4,"OrderDate"},
731
        //                                                                            {5,"OrderCompletionDate"},
732
        //                                                                            {6,"ConstructionStartingDate"},
733
        //                                                                            {7,"ConstructionCompletionDate"},
734
        //                                                                            {8,"TransferConstructionDate"},
735
        //                                                                            {9,"EstimatesExpirationDate"},
736
        //                                                                            {10,"ConstructionPeriodStart"},
737
        //                                                                            {11,"ConstructionPeriodEnd"},
738
        //                                                                            {12,"BillingStartDate"},
739
        //                                                                            {13,"BillingDate"},
740
        //                                                                            {14, "OrderStartingDate"},
741
        //                                                                        };
742
        //public static Dictionary<string, int> BaseInfoDateNoName = new Dictionary<string, int>(){
743
        //                                                                            {"RequestedDate", 1},
744
        //                                                                            {"EstimatesSubmitDeadline", 2},
745
        //                                                                            {"EstimatesSubmittedDate", 3},
746
        //                                                                            {"OrderDate", 4},
747
        //                                                                            {"OrderCompletionDate", 5},
748
        //                                                                            {"ConstructionStartingDate", 6},
749
        //                                                                            {"ConstructionCompletionDate", 7},
750
        //                                                                            {"TransferConstructionDate", 8},
751
        //                                                                            {"EstimatesExpirationDate", 9},
752
        //                                                                            {"ConstructionPeriodStart",10},
753
        //                                                                            {"ConstructionPeriodEnd", 11},
754
        //                                                                            {"BillingStartDate",12},
755
        //                                                                            {"BillingDate",	13},
756
        //                                                                            {"OrderStartingDate", 14},
757
        //                                                                        };
758
        ///// <summary>
759
        ///// 工事基本情報日付項目名称テーブル
760
        ///// </summary>
761
        //public static Dictionary<string, string> BaseInfoDateName = new Dictionary<string, string>(){
762
        //                                                                            {"RequestedDate","依頼受け日"},
763
        //                                                                            {"EstimatesSubmitDeadline","見積提出期限"},
764
        //                                                                            {"EstimatesSubmittedDate","見積提出日"},
765
        //                                                                            {"OrderDate","受注日"},
766
        //                                                                            {"OrderCompletionDate","完了予定日"},
767
        //                                                                            {"ConstructionStartingDate","施工開始日"},
768
        //                                                                            {"ConstructionCompletionDate","施工完了日"},
769
        //                                                                            {"TransferConstructionDate","工事移管日"},
770
        //                                                                            {"EstimatesExpirationDate","見積有効期限"},
771
        //                                                                            {"ConstructionPeriodStart","契約工期開始"},
772
        //                                                                            {"ConstructionPeriodEnd","契約工期完了"},
773
        //                                                                            {"BillingStartDate","請求準備開始日"},
774
        //                                                                            {"BillingDate",	"請求日"},
775
        //                                                                            {"OrderStartingDate","開始予定日"},
776
        //                                                                        };
777
        #endregion
778
        /// <summary>
779
        /// 工事基本情報日付項目テーブル
780
        /// </summary>
781
        public static Dictionary<int, string> BaseInfoDateNameNo = new Dictionary<int, string>(){
782
                                                                                    {1,"RequestedDate"},
783
                                                                                    {2,"EstimatesSubmitDeadline"},
784
                                                                                    {3,"EstimatesSubmittedDate"},
785
                                                                                    {4,"OrderDate"},
786
                                                                                    {5, "OrderStartingDate"},
787
                                                                                    {6,"OrderCompletionDate"},
788
                                                                                    {7,"ConstructionStartingDate"},
789
                                                                                    {8,"ConstructionCompletionDate"},
790
                                                                                    {9,"TransferConstructionDate"},
791
                                                                                    {10,"EstimatesExpirationDate"},
792
                                                                                    {11,"ConstructionPeriodStart"},
793
                                                                                    {12,"ConstructionPeriodEnd"},
794
                                                                                    {13,"BillingStartDate"},
795
                                                                                    {14,"BillingDate"},
796
                                                                                    {15,"ConstrPreparationDate"},   // 2016/10/07 追加
797
                                                                                };
798
        /// <summary>
799
        /// 工事基本情報日付項目名称テーブル
800
        /// </summary>
801
        public static Dictionary<string, string> BaseInfoDateName = new Dictionary<string, string>(){
802
                                                                                    {"RequestedDate","依頼受け日"},
803
                                                                                    {"EstimatesSubmitDeadline","見積提出期限"},
804
                                                                                    {"EstimatesSubmittedDate","見積提出日"},
805
                                                                                    {"OrderDate","受注日"},
806
                                                                                    {"OrderStartingDate","開始予定日"},
807
                                                                                    {"OrderCompletionDate","完了予定日"},
808
                                                                                    {"ConstrPreparationDate","施工開始準備日"},
809
                                                                                    {"ConstructionStartingDate","施工開始日"},
810
                                                                                    {"ConstructionCompletionDate","施工完了日"},
811
                                                                                    {"TransferConstructionDate","工事移管日"},
812
                                                                                    {"EstimatesExpirationDate","見積有効期限"},
813
                                                                                    {"ConstructionPeriodStart","契約工期開始"},
814
                                                                                    {"ConstructionPeriodEnd","契約工期完了"},
815
                                                                                    {"BillingStartDate","請求準備開始日"},
816
                                                                                    {"BillingDate",	"請求日"},
817
                                                                                };
818
        /// <summary>
819
        /// 工事基本情報データチェック対象日付テーブル
820
        /// </summary>
821
        public enum ConstructionBaseInfo_DateNo
822
        {
823
            /// <summary>
824
            /// 1:依頼受け日
825
            /// </summary>
826
            RequestedDate = 1,
827
            /// <summary>
828
            ///  2:見積提出期限
829
            /// </summary>
830
            EstimatesSubmitDeadline,
831
            /// <summary>
832
            ///  3:見積提出日
833
            /// </summary>
834
            EstimatesSubmittedDate,
835
            /// <summary>
836
            ///  4:受注日
837
            /// </summary>
838
            OrderDate,
839
            /// <summary>
840
            ///  5:開始予定日
841
            /// </summary>
842
            OrderStartingDate,
843
            /// <summary>
844
            ///  6:完了予定日
845
            /// </summary>
846
            OrderCompletionDate,
847
            /// <summary>
848
            ///  7:施工開始日
849
            /// </summary>
850
            ConstructionStartingDate,
851
            /// <summary>
852
            ///  8:施工完了日
853
            /// </summary>
854
            ConstructionCompletionDate,
855
            /// <summary>
856
            ///  9:工事移管日
857
            /// </summary>
858
            TransferConstructionDate,
859
            /// <summary>
860
            /// 10:見積有効期限
861
            /// </summary>
862
            EstimatesExpirationDate,
863
            /// <summary>
864
            /// 11:契約工期開始
865
            /// </summary>
866
            ConstructionPeriodStart,
867
            /// <summary>
868
            /// 12:契約工期完了
869
            /// </summary>
870
            ConstructionPeriodEnd,
871
            /// <summary>
872
            /// 13:請求準備開始日
873
            /// </summary>
874
            BillingStartDate,
875
            /// <summary>
876
            /// 14:請求日
877
            /// </summary>
878
            BillingDate,
879
            /// <summary>
880
            /// 15:施工開始準備日
881
            /// </summary>
882
            ConstrPreparationDate,
883
        }
884
        #endregion
885

  
886
        #region 工事基本情報:消費税フラグ
887
        /// <summary>
888
        /// 消費税フラグ 0:含まない 1:含む
889
        /// </summary>
890
        public enum BaseInfoConsumptionTaxFlg
891
        {
892
            /// <summary>
893
            /// 0:含まない
894
            /// </summary>
895
            NotInclue = 0,
896
            /// <summary>
897
            /// 1:含む
898
            /// </summary>
899
            Include,
900
        }
901
        #endregion
902

  
903
        #region 工事基本情報:営業経費発生フラグ
904
        /// <summary>
905
        /// 営業経費発生フラグ 0:発生しない 1:発生する 
906
        /// </summary>
907
        public enum BaseInfoSalesCostFlg
908
        {
909
            /// <summary>
910
            /// 0:発生しない
911
            /// </summary>
912
            NotOn = 0,
913
            /// <summary>
914
            /// 1:発生する 
915
            /// </summary>
916
            On,
917
        }
918
        #endregion
919

  
920
        #region 工事基本情報:見積種別
921
        /// <summary>
922
        /// 見積種別 0:通常見積 1:入札物件 2:予算取り見積
923
        /// </summary>
924
        public enum BaseInfoEstimateType
925
        {
926
            /// <summary>
927
            /// 0:通常見積
928
            /// </summary>
929
            Normal = 0,
930
            /// <summary>
931
            /// 1:入札物件
932
            /// </summary>
933
            Didding,
934
            /// <summary>
935
            /// 2:予算取り見積
936
            /// </summary>
937
            GetBudget,
938
        }
939
        #endregion
940

  
941
        #region 工事基本情報:請求回数フラグ
942
        /// <summary>
943
        /// 請求回数フラグ 0:分割請求 1:一括請求
944
        /// </summary>
945
        public enum BaseInfoBillingSplitFlg
946
        {
947
            /// <summary>
948
            /// 0:一括請求
949
            /// </summary>
950
            AllOnBilling = 0,
951
            /// <summary>
952
            /// 1:分割請求
953
            /// </summary>
954
            SplitBilling,
955
        }
956
        #endregion
957

  
958 621
        #region 工事基本情報:見積有効期限(月)
959 622
        /// <summary>
960 623
        /// 見積有効期限(月)
......
1136 799
        public static int s_PrintOutPrice = 300000;
1137 800
        #endregion
1138 801

  
1139
        #region 交通費及び購入品等入力:データ種別
1140
        /// <summary>
1141
        /// 交通費及び購入品等入力:データ種別
1142
        /// </summary>
1143
        public enum CostDataNo
1144
        {
1145
            /// <summary>
1146
            /// 交通費
1147
            /// </summary>
1148
            Transport = 1,
1149
            /// <summary>
1150
            /// 購入品費
1151
            /// </summary>
1152
            Purchase,
1153
            /// <summary>
1154
            /// 車両リース代
1155
            /// </summary>
1156
            Lease,
1157
            /// <summary>
1158
            /// 駐車場・資材置き場代
1159
            /// </summary>
1160
            StoragePlace,
1161
            /// <summary>
1162
            /// 宿泊費
1163
            /// </summary>
1164
            Lodging,
1165
            /// <summary>
1166
            /// 処分費
1167
            /// </summary>
1168
            DisposalCost,
1169
        }
1170

  
1171
        /// <summary>
1172
        /// データ種別
1173
        /// </summary>
1174
        public static readonly string[] CostDataNoString = new string[] { "", "交 通 費", "購入品費", "車両リース代", "駐車場・資材置き場代", "宿 泊 費", "処 分 費" };
1175
        #endregion
1176

  
1177 802
        #region 汎用データ:コードデータ種別
1178 803
        /// <summary>
1179 804
        /// 汎用データ:コードデータ種別
......
1349 974
        public static int AssistantMonthryCost = 100000;
1350 975
        #endregion
1351 976

  
1352
        #region 協力会社マスタ:協力業者支払区分
1353
        /// <summary>
1354
        /// 協力業者支払区分
1355
        /// </summary>
1356
        public enum SubContractorPaymentKind
1357
        {
1358
            /// <summary>
1359
            /// 0:通常払い
1360
            /// </summary>
1361
            Normal = 0,
1362
            /// <summary>
1363
            /// 1:手間払い
1364
            /// </summary>
1365
            Labor,
1366
        }
1367
        /// <summary>
1368
        /// 協力業者支払区分
1369
        /// </summary>
1370
        public static List<KeyValuePair<int, string>> s_SubContractorKind = new List<KeyValuePair<int, string>>(){
1371
                                                                            new KeyValuePair<int,string>(0,"通 常 業 者"),
1372
                                                                            new KeyValuePair<int,string>(1,"手 間 業 者")};
1373
        #endregion
1374

  
1375 977
        #region 工事詳細台帳:集計フラグ
1376 978
        /// <summary>
1377 979
        /// 工事詳細台帳:集計フラグ
......
1434 1036
        }
1435 1037
        #endregion
1436 1038

  
1437
        #region 工事リンク情報:リンク種別
1438
        /// <summary>
1439
        /// 工事リンク情報:リンク種別
1440
        /// </summary>
1441
        public enum LinkDataType
1442
        {
1443
            /// <summary>
1444
            /// 0:増減工事
1445
            /// </summary>
1446
            FluctuationType = 0,
1447
            /// <summary>
1448
            /// 1:結合工事
1449
            /// </summary>
1450
            JoinType,
1451
        }
1452
        #endregion
1453

  
1454
        #region 工事基本情報:紐付データフラグ
1455
        /// <summary>
1456
        /// 工事基本情報:紐付データフラグ
1457
        /// </summary>
1458
        public enum BaseInfoTyingFlg
1459
        {
1460
            /// <summary>
1461
            /// 0:独立データ
1462
            /// </summary>
1463
            Standard = 0,
1464
            /// <summary>
1465
            /// 1:増減親データ
1466
            /// </summary>
1467
            Parent,
1468
            /// <summary>
1469
            /// 2:増減子データ
1470
            /// </summary>
1471
            Tying,
1472
        }
1473
        #endregion
1474

  
1475
        #region 工事基本情報:結合工事フラグ
1476
        /// <summary>
1477
        /// 工事基本情報:結合工事フラグ
1478
        /// </summary>
1479
        public enum BaseInfoJoinFlg
1480
        {
1481
            /// <summary>
1482
            /// 0:結合無通常データ
1483
            /// </summary>
1484
            Standard = 0,
1485
            /// <summary>
1486
            /// 1:結合親データ
1487
            /// </summary>
1488
            JoinParent,
1489
            /// <summary>
1490
            /// 2:結合子データ
1491
            /// </summary>
1492
            JoinChildren,
1493
        }
1494
        #endregion
1495

  
1496
        #region 工事詳細台帳:台帳入力完了フラグ
1497
        /// <summary>
1498
        /// 工事詳細台帳:台帳入力完了フラグ
1499
        /// </summary>
1500
        public enum ComplateTitleNo
1501
        {
1502
            /// <summary>
1503
            /// 台 帳 入 力 中
1504
            /// </summary>
1505
            Operateing = 0,
1506
            /// <summary>
1507
            /// 完 了 済 台 帳
1508
            /// </summary>
1509
            Complated,
1510
        }
1511
        #endregion
1512

  
1513
        #region 工事詳細台帳明細:担当中フラグ
1514
        /// <summary>
1515
        /// 担当中フラグ
1516
        /// </summary>
1517
        public enum SalaryOperateKind
1518
        {
1519
            /// <summary>
1520
            /// 担当終了
1521
            /// </summary>
1522
            Complate = 0,
1523
            /// <summary>
1524
            /// 担当中
1525
            /// </summary>
1526
            Oparateing,
1527
        }
1528
        #endregion
1529

  
1530
        #region 工事詳細台帳明細:増減工事フラグ
1531
        /// <summary>
1532
        /// 工事詳細台帳:増減工事フラグ
1533
        /// </summary>
1534
        public enum FluctuatesFlg
1535
        {
1536
            /// <summary>
1537
            /// 0:通常データ
1538
            /// </summary>
1539
            Normal = 0,
1540
            /// <summary>
1541
            /// 1:増減データ
1542
            /// </summary>
1543
            Fluctuates,
1544
        }
1545
        #endregion
1546

  
1547
        #region 工事詳細台帳明細:注文書発行フラグ
1548
        /// <summary>
1549
        /// 工事詳細台帳明細:注文書データ作成フラグ
1550
        /// </summary>
1551
        public enum PurchaseOrderFlg
1552
        {
1553
            /// <summary>
1554
            /// 未作成
1555
            /// </summary>
1556
            NoCreate = 0,
1557
            /// <summary>
1558
            /// 作成済
1559
            /// </summary>
1560
            Making = 1,
1561
            /// <summary>
1562
            /// 作成しない
1563
            /// </summary>
1564
            NotMakingData = 9,
1565
        }
1566
        #endregion
1567

  
1568
        #region 担当者マスタ:工事詳細台帳計算対象フラグ
1569
        /// <summary>
1570
        /// 担当者マスタ:工事詳細台帳計算対象フラグ
1571
        /// </summary>
1572
        public enum PersonLedgerDivNo
1573
        {
1574
            /// <summary>
1575
            /// 対象外
1576
            /// </summary>
1577
            CalcOuter = 0,
1578
            /// <summary>
1579
            /// 対象
1580
            /// </summary>
1581
            CalcTarget,
1582
        }
1583
        #endregion
1584

  
1585
        #region 担当者対象部署マスタ:所属フラグ
1586
        /// <summary>
1587
        /// 担当者対象部署マスタ:所属フラグ
1588
        /// </summary>
1589
        public enum AffiliationFlg
1590
        {
1591
            /// <summary>
1592
            /// 他部署
1593
            /// </summary>
1594
            Ohter = 0,
1595
            /// <summary>
1596
            /// 所属部署
1597
            /// </summary>
1598
            Affiliation,
1599
        }
1600
        #endregion
1601

  
1602 1039
        #region 起動対象マスタ:データ編集フラグ
1603 1040
        /// <summary>
1604 1041
        /// 起動対象マスタ:データ編集フラグ
......
1616 1053
        }
1617 1054
        #endregion
1618 1055

  
1619
        #region 保護区分マスタ:総務業務フラグ
1620
        /// <summary>
1621
        /// 保護区分マスタ:総務業務フラグ
1622
        /// </summary>
1623
        public enum GeneralAffairs
1624
        {
1625
            /// <summary>
1626
            /// 総務以外
1627
            /// </summary>
1628
            OtherDep = 0,
1629
            /// <summary>
1630
            /// 総務業務対象
1631
            /// </summary>
1632
            GeneralDep,
1633
        }
1634
        #endregion
1635

  
1636
        #region 保護区分マスタ:総務業務名称
1637
        /// <summary>
1638
        /// 保護区分マスタ:総務業務名称
1639
        /// </summary>
1640
        public static List<KeyValuePair<int, string>> GeneralAffairsList = new List<KeyValuePair<int, string>>{
1641
                                                                                new KeyValuePair<int,string>(0,"総務業務不可"),
1642
                                                                                new KeyValuePair<int,string>(1,"総務業務可能")};
1643
        #endregion
1644

  
1645 1056
        #region 承認対象区分
1646 1057
        /// <summary>
1647 1058
        /// 承認対象区分
......
1685 1096
                                                                      { "資材返却", "返却期限を過ぎた資材があります。", "0x808080", "0xFF0000" }
1686 1097
                                                                    };
1687 1098
        public static List<KeyValuePair<int, int>> MaterualStatusCheckList = new List<KeyValuePair<int, int>>{
1688
            new KeyValuePair<int, int>((int)CommonDefine.TermDateCheckTiming.CheckSchdule1, 0),
1689
            new KeyValuePair<int, int>((int)CommonDefine.TermDateCheckTiming.CheckSchdule3, 1)};
1099
            new KeyValuePair<int, int>((int)TermMaster.TermDateCheckTimingDef.CheckSchdule1, 0),
1100
            new KeyValuePair<int, int>((int)TermMaster.TermDateCheckTimingDef.CheckSchdule3, 1)};
1690 1101
        #endregion
1691 1102

  
1692 1103
        #region 規定値フォーム位置移動
branches/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs
378 378
        {
379 379
            int nRetVal = 0;
380 380
            // 初期値セット
381
            if (m_systemMaster.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
381
            if (m_systemMaster.ConstructionNoBase == (int)SystemMaster.ConstrNoBaseDef.BusinessPeriod)
382 382
                nRetVal = m_systemMaster.BusinessPeriod;
383 383
            else
384 384
                nRetVal = m_systemMaster.ConstructionYear;
......
992 992
        /// <param name="strColor"></param>
993 993
        /// <param name="point"></param>
994 994
        /// <returns></returns>
995
        public static Color getBackForeColor(string strColor, CommonDefine.PalceOfColor point)
995
        public static Color getBackForeColor(string strColor, TermMaster.PalceOfColorDef point)
996 996
        {
997 997
            Color ColorRet = Color.White;
998 998
            try
999 999
            {
1000 1000
                // デフォルトセット
1001
                if (point == CommonDefine.PalceOfColor.BackColor)
1001
                if (point == TermMaster.PalceOfColorDef.BackColor)
1002 1002
                {   // 背景
1003 1003
                    ColorRet = Color.White;
1004 1004
                }
1005
                else if (point == CommonDefine.PalceOfColor.ForeColor)
1005
                else if (point == TermMaster.PalceOfColorDef.ForeColor)
1006 1006
                {   // 文字色
1007 1007
                    ColorRet = Color.Black;
1008 1008
                }
......
1891 1891
            {
1892 1892
                string strRet = string.Empty;
1893 1893

  
1894
                if (master.CorporateStatusPoint == (int)CommonDefine.StatusNamePoint.Forword)
1894
                if (master.CorporateStatusPoint == (int)BusinessTypeMaster.StatusNamePointDef.Forword)
1895 1895
                    strRet = master.CorporateStatusName + " " + master.OrderersName1 + " " + master.OrderersName2;
1896
                else if (master.CorporateStatusPoint == (int)CommonDefine.StatusNamePoint.Back)
1896
                else if (master.CorporateStatusPoint == (int)BusinessTypeMaster.StatusNamePointDef.Back)
1897 1897
                    strRet = master.OrderersName1 + " " + master.CorporateStatusName + " " + master.OrderersName2;
1898 1898
                else
1899 1899
                    strRet = master.OrderersName1 + " " + master.OrderersName2;
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
14 14
        /// <summary>
15 15
        /// 本体バージョン
16 16
        /// </summary>
17
        public static int s_SystemVersion = 76;
17
        public static int s_SystemVersion = 78;
18 18

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeBaseInfoData.cs
124 124
                int LinkCount = 0;
125 125
                RemoveList.Add(RemoveCode);
126 126
                // 増減工事親確認
127
                if (BaseRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Parent)
127
                if (BaseRec.TyingFlg == (int)ConstructionBaseInfo.TyingFlgDef.Parent)
128 128
                {
129 129
                    GetLinkageCode(RemoveCode, DB03, ref RemoveList, false);
130 130
                }
131
                else if (BaseRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Tying)
131
                else if (BaseRec.TyingFlg == (int)ConstructionBaseInfo.TyingFlgDef.Tying)
132 132
                {
133 133
                    LinkCount = GetLinkageCode2(RemoveCode, DB03, ref ParentCode);
134 134
                }
135 135
                // 結合工事親確認
136
                if (BaseRec.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinParent)
136
                if (BaseRec.JoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.JoinParent)
137 137
                {
138 138
                    GetLinkageCode(RemoveCode, DB03, ref UpdateLinkList, true);
139 139
                }
......
184 184
                    DB26.DeleteAction(strRemove, false);
185 185
                    DB27.DeleteAction(strRemove, false);
186 186

  
187
                    if (BaseRec.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinParent
188
                        || BaseRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Parent)
187
                    if (BaseRec.JoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.JoinParent
188
                        || BaseRec.TyingFlg == (int)ConstructionBaseInfo.TyingFlgDef.Parent)
189 189
                    {
190 190
                        DB03.DeleteAction(strRemove, false);
191 191
                    }
192
                    else if (BaseRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Tying)
192
                    else if (BaseRec.TyingFlg == (int)ConstructionBaseInfo.TyingFlgDef.Tying)
193 193
                    {
194 194
                        strRemove2 = string.Format(" Where FluctuationCode = {0}", RemoveList[i]);
195
                        strRemove2 += string.Format(" AND LINKTYPE = {0}", (int)CommonDefine.LinkDataType.FluctuationType);
195
                        strRemove2 += string.Format(" AND LINKTYPE = {0}", (int)ConstructionLink.DataTypeDef.FluctuationType);
196 196
                        DB03.DeleteAction(strRemove2, false);
197 197
                    }
198
                    else if (BaseRec.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinChildren)
198
                    else if (BaseRec.JoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.JoinChildren)
199 199
                    {
200 200
                        // 削除処理の未実装
201 201
                    }
......
205 205
                if (ProcSuccess)
206 206
                {
207 207
                    // 増減工事子の場合(最後のリンク情報か、どうかの確認)
208
                    if (BaseRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Tying)
208
                    if (BaseRec.TyingFlg == (int)ConstructionBaseInfo.TyingFlgDef.Tying)
209 209
                    {
210 210
                        if (LinkCount == 1)
211 211
                        {   // 最後のリンクは親を増減工事より外す
212 212
                            if (!DB01.UpdateFeild(ParentCode
213 213
                                                , (int)IOConstructionBaseInfo.TableColumn.TyingFlg
214
                                                , (int)CommonDefine.BaseInfoTyingFlg.Standard
214
                                                , (int)ConstructionBaseInfo.TyingFlgDef.Standard
215 215
                                                , false))
216 216
                            {
217 217
                                ProcSuccess = false;
......
219 219
                        }
220 220
                    }
221 221
                    // 結合工事親確認
222
                    if (BaseRec.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinParent)
222
                    if (BaseRec.JoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.JoinParent)
223 223
                    {
224 224
                        string strSQL = string.Empty;
225 225
                        for (int i = 0; i < UpdateLinkList.Count; i++)
226 226
                        {
227 227
                            if (!DB01.UpdateFeild(UpdateLinkList[i]
228 228
                                                , (int)IOConstructionBaseInfo.TableColumn.JoinFlg
229
                                                , (int)CommonDefine.BaseInfoJoinFlg.Standard
229
                                                , (int)ConstructionBaseInfo.JoinFlgDef.Standard
230 230
                                                , false))
231 231
                            {
232 232
                                ProcSuccess = false;
233 233
                                break;
234 234
                            }
235
                            strSQL = string.Format("UPDATE CONSTRUCTIONBASEINFO A SET A.JOINFLG = {0}", (int)CommonDefine.BaseInfoJoinFlg.Standard);
235
                            strSQL = string.Format("UPDATE CONSTRUCTIONBASEINFO A SET A.JOINFLG = {0}", (int)ConstructionBaseInfo.JoinFlgDef.Standard);
236 236
                            strSQL += " WHERE A.CONSTRUCTIONCODE IN (SELECT AA.FLUCTUATIONCODE FROM CONSTRUCTIONLINK AA";
237 237
                            strSQL += string.Format(" WHERE AA.CONSTRUCTIONCODE = {0}",UpdateLinkList[i]);
238
                            strSQL += string.Format(" AND AA.LINKTYPE = {0})", (int)CommonDefine.LinkDataType.FluctuationType);
238
                            strSQL += string.Format(" AND AA.LINKTYPE = {0})", (int)ConstructionLink.DataTypeDef.FluctuationType);
239 239
                            DB01.ExecuteNonQuery(strSQL, false);
240 240
                        }
241 241
                    }
......
293 293
                string strSQL = "SELECT FLUCTUATIONCODE FROM CONSTRUCTIONLINK";
294 294
                strSQL += LinkDB.CreatePrimarykeyString(RemoveCode);
295 295
                if (bJoin)
296
                    strSQL += string.Format(" AND LINKTYPE = {0}", (int)CommonDefine.LinkDataType.JoinType);
296
                    strSQL += string.Format(" AND LINKTYPE = {0}", (int)ConstructionLink.DataTypeDef.JoinType);
297 297
                else
298
                    strSQL += string.Format(" AND LINKTYPE = {0}", (int)CommonDefine.LinkDataType.FluctuationType);
298
                    strSQL += string.Format(" AND LINKTYPE = {0}", (int)ConstructionLink.DataTypeDef.FluctuationType);
299 299
                ArrayList arList = new ArrayList();
300 300
                if (!LinkDB.ExecuteReader(strSQL, ref arList)) return;
301 301
                foreach (object[] CurRec in arList)
......
320 320
            {
321 321
                string strSQL = "SELECT B.CONSTRUCTIONCODE, COUNT(*) FROM CONSTRUCTIONLINK A, CONSTRUCTIONLINK B";
322 322
                strSQL += string.Format(" WHERE A.FLUCTUATIONCODE = {0}", RemoveCode);
323
                strSQL += string.Format(" AND A.LINKTYPE = {0}", (int)CommonDefine.LinkDataType.FluctuationType);
323
                strSQL += string.Format(" AND A.LINKTYPE = {0}", (int)ConstructionLink.DataTypeDef.FluctuationType);
324 324
                strSQL += " AND B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
325 325
                strSQL += " GROUP BY B.CONSTRUCTIONCODE";
326 326

  
......
358 358
                string strParent = "SELECT DISTINCT(A.CONSTRUCTIONCODE), B.REQUESTEDDATE, 0, 0, 0, 0, F.DETAILSTRING, B.JOINFLG";
359 359
                strParent += " FROM CONSTRUCTIONLINK A";
360 360
                strParent += " LEFT OUTER JOIN CONSTRUCTIONBASEINFODETAIL F ON F.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
361
                strParent += string.Format(" AND F.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
361
                strParent += string.Format(" AND F.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
362 362
                strParent += " , CONSTRUCTIONBASEINFO B";
363 363

  
364 364
                strParent += string.Format(" WHERE A.FLUCTUATIONCODE = {0}", SearchCode);
......
368 368
                    case 0:
369 369
                    case 2:
370 370
                        // 結合タイプよりデータを検索
371
                        strParent += string.Format(" AND A.LINKTYPE = {0}", (int)CommonDefine.LinkDataType.JoinType);
371
                        strParent += string.Format(" AND A.LINKTYPE = {0}", (int)ConstructionLink.DataTypeDef.JoinType);
372 372
                        break;
373 373
                    case 1:
374 374
                        // 増減タイプよりデータを検索
375
                        strParent += string.Format(" AND A.LINKTYPE = {0}", (int)CommonDefine.LinkDataType.FluctuationType);
375
                        strParent += string.Format(" AND A.LINKTYPE = {0}", (int)ConstructionLink.DataTypeDef.FluctuationType);
376 376
                        break;
377 377
                }
378 378

  
......
398 398

  
399 399
                // 結合の元データ以外はクリア
400 400
                object[] objRec = (object[])DataList[0];
401
                if (CommonMotions.cnvInt(objRec[7]) != (int)CommonDefine.BaseInfoJoinFlg.JoinParent)
401
                if (CommonMotions.cnvInt(objRec[7]) != (int)ConstructionBaseInfo.JoinFlgDef.JoinParent)
402 402
                {
403 403
                    int SecondCode = CommonMotions.cnvInt(objRec[0]);
404 404
                    DataList.Clear();
......
430 430
                if (!BaseDB.SelectAction(strSQL, ref BaseRec, false)) return false;
431 431

  
432 432
                // 結合工事では無ければ処理しない
433
                if (BaseRec.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.Standard) return true;
433
                if (BaseRec.JoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.Standard) return true;
434 434

  
435 435
                // 対象の親番号を取得する
436 436
                int ParentCode = ClsProcessExist.GetParentConstrCode(TargetCode);
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs
84 84
                strDelSQL += " (SELECT A1.CONSTRUCTIONCODE FROM CONSTRUCTIONBASEINFO A1";
85 85
                strDelSQL += string.Format(" WHERE (A1.SALESPERSONCODE = {0} OR A1.CONSTRUCTIONPERSONCODE = {0} OR A1.CONSTRSUBPERSONCODE = {0} OR A1.CONSTRUCTIONINSTRUCTOR = {0}))", PersonCode);
86 86
                strDelSQL += string.Format(" AND GROUPCOUNT IN ({0}, {1}, {2}, {3}, {4}, {5})"
87
                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.Transport)
88
                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.Purchase)
89
                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.Lease)
90
                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.StoragePlace)
91
                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.Lodging)
92
                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.DisposalCost));
87
                                                                , GetConstructionLedgerGroupNo((int)CostDataOfPerson.DataNoDef.Transport)
88
                                                                , GetConstructionLedgerGroupNo((int)CostDataOfPerson.DataNoDef.Purchase)
89
                                                                , GetConstructionLedgerGroupNo((int)CostDataOfPerson.DataNoDef.Lease)
90
                                                                , GetConstructionLedgerGroupNo((int)CostDataOfPerson.DataNoDef.StoragePlace)
91
                                                                , GetConstructionLedgerGroupNo((int)CostDataOfPerson.DataNoDef.Lodging)
92
                                                                , GetConstructionLedgerGroupNo((int)CostDataOfPerson.DataNoDef.DisposalCost));
93 93
                strDelSQL += string.Format(" AND DATE(TARGETMONTH) = STR_TO_DATE('{0}','%Y/%m/%d')", (TargetMonth + "/01"));
94 94
                LedgerExcuteDB.ExecuteNonQuery(strDelSQL, false);
95 95

  
96
                for (int i = (int)CommonDefine.CostDataNo.Transport; i <= (int)CommonDefine.CostDataNo.DisposalCost; i++)
96
                for (int i = (int)CostDataOfPerson.DataNoDef.Transport; i <= (int)CostDataOfPerson.DataNoDef.DisposalCost; i++)
97 97
                {
98 98
                    string strSQL = "SELECT CONSTRUCTIONCODE, DATATYPE, DATE_FORMAT(ACTIONDATE,'%Y/%m'), SUM(ENTRYPRICE) FROM COSTDATAOFPERSON";
99 99
                    strSQL += String.Format(" WHERE DATE_FORMAT(ACTIONDATE,'%Y/%m') = '{0}'", TargetMonth);
......
370 370
            // 工事台帳のグループ番号を取得する
371 371
            switch (TargetData)
372 372
            {
373
                case (int)CommonDefine.CostDataNo.Transport:
373
                case (int)CostDataOfPerson.DataNoDef.Transport:
374 374
                    // 交通費(通行料・電車代)
375 375
                    GroupNo = (int)FrmConstructionLedger.DataGroup.TransportationCosts;
376 376
                    break;
377
                case (int)CommonDefine.CostDataNo.Purchase:
377
                case (int)CostDataOfPerson.DataNoDef.Purchase:
378 378
                    // 購入品
379 379
                    GroupNo = (int)FrmConstructionLedger.DataGroup.PurchaseCosts;
380 380
                    break;
381
                case (int)CommonDefine.CostDataNo.Lease:
381
                case (int)CostDataOfPerson.DataNoDef.Lease:
382 382
                    // 車両リース代
383 383
                    GroupNo = (int)FrmConstructionLedger.DataGroup.VehicleLeaseFee;
384 384
                    break;
385
                case (int)CommonDefine.CostDataNo.StoragePlace:
385
                case (int)CostDataOfPerson.DataNoDef.StoragePlace:
386 386
                    // 駐車場・資材置き場
387 387
                    GroupNo = (int)FrmConstructionLedger.DataGroup.ParkingCosts;
388 388
                    break;
389
                case (int)CommonDefine.CostDataNo.Lodging:
389
                case (int)CostDataOfPerson.DataNoDef.Lodging:
390 390
                    // 宿泊費
391 391
                    GroupNo = (int)FrmConstructionLedger.DataGroup.RoomChargeCosts;
392 392
                    break;
393
                case (int)CommonDefine.CostDataNo.DisposalCost:
393
                case (int)CostDataOfPerson.DataNoDef.DisposalCost:
394 394
                    // 処分費
395 395
                    GroupNo = (int)FrmConstructionLedger.DataGroup.DisposeCosts;
396 396
                    break;
......
554 554
                // 工事詳細台帳明細データ取得
555 555
                List<ConstructionLedgerDetail> DetailList = new List<ConstructionLedgerDetail>();
556 556
                string DetailSQL = LedgerDeDB.CreatePrimarykeyString(LedgerRec.ConstructionCode);
557
                DetailSQL += string.Format(" AND OperatingFlg = {0}", (int)CommonDefine.SalaryOperateKind.Oparateing);  // 対応中フラグ
557
                DetailSQL += string.Format(" AND OperatingFlg = {0}", (int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing);  // 対応中フラグ
558 558
                DetailSQL += string.Format(" AND SALARYFLG != {0}", (int)CommonDefine.SalaryDevision.Noting);           // 給与振分区分
559 559
                DetailSQL += string.Format(" AND GROUPCOUNT IN ({0},{1},{2})",
560 560
                                                                (int)FrmConstructionLedger.DataGroup.Instructor,        // 指導員給料
......
579 579
                    // コードがない場合は処理しない
580 580
                    if (CurRec.CompanyCode == 0) continue;
581 581
                    // 施工管理中担当者ではない場合は処理しない
582
                    if (CurRec.OperatingFlg == (int)CommonDefine.SalaryOperateKind.Complate) continue;
582
                    if (CurRec.OperatingFlg == (int)ConstructionLedgerDetail.SalOpeKindDef.Complate) continue;
583 583

  
584 584
                    // 現在の値を取得する
585 585
                    int NowValue = 0;
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
2679 2679
                }
2680 2680
                if (EditFlg == (int)CommonDefine.ProcessDataEdit.Reference) frm.EditLock = true;
2681 2681

  
2682
                frm.EntryMode = (int)CommonDefine.EmployeeClassFlg.Regular;
2682
                frm.EntryMode = (int)PersonInChargeMaster.EmployeeClassFlgDef.Regular;
2683 2683
                frm.ShowDialog();
2684 2684
            }
2685 2685
            catch (Exception ex)
......
3269 3269
                }
3270 3270
                if (EditFlg == (int)CommonDefine.ProcessDataEdit.Reference) frm.EditLock = true;
3271 3271

  
3272
                frm.EntryMode = (int)CommonDefine.EmployeeClassFlg.OutSource;
3272
                frm.EntryMode = (int)PersonInChargeMaster.EmployeeClassFlgDef.OutSource;
3273 3273
                frm.ShowDialog();
3274 3274
            }
3275 3275
            catch (Exception ex)
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsProcessExist.cs
131 131
                if (!BaseDB.SelectAction(strBase, ref BaseRec)) return InputCode;
132 132

  
133 133
                // 結合工事のチェック
134
                if (BaseRec.JoinFlg != (int)CommonDefine.BaseInfoJoinFlg.Standard)
134
                if (BaseRec.JoinFlg != (int)ConstructionBaseInfo.JoinFlgDef.Standard)
135 135
                {
136 136
                    // 結合工事は結合親工事番号を返す
137 137
                    int FuncCnt = 0;
......
146 146
                else
147 147
                {
148 148
                    // 増減工事でない場合はそのまま工事コードを返す
149
                    if (BaseRec.TyingFlg != (int)CommonDefine.BaseInfoTyingFlg.Tying) return InputCode;
149
                    if (BaseRec.TyingFlg != (int)ConstructionBaseInfo.TyingFlgDef.Tying) return InputCode;
150 150
                }
151 151
                // 増減工事の場合は親コードを検索する
152 152
                string strLink = string.Format(" WHERE FluctuationCode = {0}", InputCode);
......
192 192

  
193 193
                bool bJoinFlg = true;
194 194
                object[] objRec1 = (object[])BaseList[0];
195
                if (CommonMotions.cnvInt(objRec1[1]) == (int)CommonDefine.BaseInfoJoinFlg.Standard) bJoinFlg = false;
195
                if (CommonMotions.cnvInt(objRec1[1]) == (int)ConstructionBaseInfo.JoinFlgDef.Standard) bJoinFlg = false;
196 196

  
197 197
                int iCode = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("非 受 注")).Key;
198
                int LinkJoin = (int)CommonDefine.LinkDataType.JoinType;
199
                int LinkFluctuation = (int)CommonDefine.LinkDataType.FluctuationType;
198
                int LinkJoin = (int)ConstructionLink.DataTypeDef.JoinType;
199
                int LinkFluctuation = (int)ConstructionLink.DataTypeDef.FluctuationType;
200 200

  
201 201
                if (bJoinFlg)
202 202
                {
......
283 283

  
284 284
                // 結合・増減工事は構成工事コードを全てとる
285 285
                m_SearchCode = m_ConstructionCode;
286
                if (m_BaseInfoJoinFlg != (int)CommonDefine.BaseInfoJoinFlg.Standard || m_BaseInfoTyingFlg != (int)CommonDefine.BaseInfoTyingFlg.Standard)
286
                if (m_BaseInfoJoinFlg != (int)ConstructionBaseInfo.JoinFlgDef.Standard || m_BaseInfoTyingFlg != (int)ConstructionBaseInfo.TyingFlgDef.Standard)
287 287
                {
288 288
                    // 検索工事番号を返す
289 289
                    m_SearchCode = GetParentConstrCode(m_ConstructionCode);
......
475 475

  
476 476
                string strSQL = string.Empty;
477 477
                // 結合工事以外の場合は自データのチェック
478
                if (m_BaseInfoJoinFlg == (int)CommonDefine.BaseInfoJoinFlg.Standard)
478
                if (m_BaseInfoJoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.Standard)
479 479
                {
480 480
                    strSQL = EdimateDB.CreatePrimarykeyString(m_ConstructionCode);
481 481
                }
......
520 520
                strSQL += " FROM ESTIMATEDATA A, PROCESSAPPROVAL B";
521 521
                
522 522
                // 結合工事以外の場合は自データのチェック
523
                if (m_BaseInfoJoinFlg == (int)CommonDefine.BaseInfoJoinFlg.Standard)
523
                if (m_BaseInfoJoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.Standard)
524 524
                {
525 525
                    strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
526 526
                }
......
572 572

  
573 573
                string strSQL = string.Empty;
574 574
                // 結合工事以外の場合は自データのチェック
575
                if (m_BaseInfoJoinFlg == (int)CommonDefine.BaseInfoJoinFlg.Standard)
575
                if (m_BaseInfoJoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.Standard)
576 576
                {
577 577
                    strSQL = EdimateDB.CreatePrimarykeyString(m_ConstructionCode);
578 578
                }
......
618 618
                strSQL += " FROM CONSTRUCTIONBASEINFO A,ESTIMATEDATA B, PROCESSAPPROVAL C";
619 619
                
620 620
                // 結合工事以外の場合は自データのチェック
621
                if (m_BaseInfoJoinFlg == (int)CommonDefine.BaseInfoJoinFlg.Standard)
621
                if (m_BaseInfoJoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.Standard)
622 622
                {
623 623
                    strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
624 624
                }
......
673 673
                strSQL += " FROM CONSTRUCTIONBASEINFO A,ESTIMATEDATA B";
674 674

  
675 675
                // 結合工事以外の場合は自データのチェック
676
                if (m_BaseInfoJoinFlg == (int)CommonDefine.BaseInfoJoinFlg.Standard)
676
                if (m_BaseInfoJoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.Standard)
677 677
                {
678 678
                    strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
679 679
                }
......
722 722
                strSQL += " FROM CONSTRUCTIONBUDGET A, PROCESSAPPROVAL B";
723 723

  
724 724
                // 結合工事以外の場合は自データのチェック
725
                if (m_BaseInfoJoinFlg == (int)CommonDefine.BaseInfoJoinFlg.Standard)
725
                if (m_BaseInfoJoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.Standard)
726 726
                {
727 727
                    strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
728 728
                }
......
775 775
                strSQL += " FROM PURCHASEORDER A, PROCESSAPPROVAL B";
776 776

  
777 777
                // 結合工事以外の場合は自データのチェック
778
                if (m_BaseInfoJoinFlg == (int)CommonDefine.BaseInfoJoinFlg.Standard)
778
                if (m_BaseInfoJoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.Standard)
779 779
                {
780 780
                    strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);
781 781
                }
......
873 873
                string strSQL = string.Empty;
874 874

  
875 875
                // 結合工事以外の場合は自データのチェック
876
                if (m_BaseInfoJoinFlg == (int)CommonDefine.BaseInfoJoinFlg.Standard)
876
                if (m_BaseInfoJoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.Standard)
877 877
                {
878 878
                    strSQL = LedgerDB.CreatePrimarykeyString(m_ConstructionCode);
879 879
                }
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs
88 88
                // 更新済みにするために日付の更新
89 89
                if (!(ProcessFlg = UpDateTargetDate(DateTime.Now))) return;
90 90

  
91
                // 管理マスタの期・年更新
92
                if (!UpDateSystemMaster()) return;
93

  
91 94
                // ----- データチェック
92 95
                // 資材返却期限のチェックを行う
93 96
                if (!(ProcessFlg = MaterialLimitCheck(m_lastsessionDate))) return;
......
259 262
        /// 資材返却ステータス取得処理
260 263
        /// </summary>
261 264
        /// <returns></returns>
262
        public void MaterualStatusCheck(MaterialRecordInfo checkRec, DateTime CriteriaDate, ref TermMaster TermRec)
265
        public void MaterualStatusCheck(MaterialRecordInfo checkRec, ref TermMaster TermRec)
263 266
        {
264 267
            try
265 268
            {
269
                // 対象日セット
270
                DateTime CriteriaDate = DateTime.Now;
266 271
                // 対象日付を設定
267 272
                DateTime Target = checkRec.RepayPlanDate;
268 273

  
......
271 276
                // 当日のチェック 今日を基準に対象日と比較する
272 277
                if (Target.Date == CriteriaDate.Date)
273 278
                {
274
                    TermMasterData.CheckSchdule = (int)CommonDefine.TermDateCheckTiming.CheckSchdule1;
279
                    TermMasterData.CheckSchdule = (int)TermMaster.TermDateCheckTimingDef.CheckSchdule1;
275 280
                    TermMasterData.TermDays     = CommonDefine.MaterualStatusCheckList[0].Value;
276 281
                    TermMasterData.SendTitle    = CommonDefine.MaterualLimitItem[0, 0];
277 282
                    TermMasterData.SendMessage  = CommonDefine.MaterualLimitItem[0, 1];
......
279 284
                    TermMasterData.ForeColor    = CommonDefine.MaterualLimitItem[0, 3];
280 285
                }
281 286
                // 後日以降継続のチェック 今日を基準に経過日(1日)が過ぎているか比較する
282
                if (Target.AddDays(1).Date <= CriteriaDate.Date)
287
                else if (Target.AddDays(1).Date <= CriteriaDate.Date)
283 288
                {
284
                    TermMasterData.CheckSchdule = (int)CommonDefine.TermDateCheckTiming.CheckSchdule3;
289
                    TermMasterData.CheckSchdule = (int)TermMaster.TermDateCheckTimingDef.CheckSchdule3;
285 290
                    TermMasterData.TermDays     = CommonDefine.MaterualStatusCheckList[1].Value;
286 291
                    TermMasterData.SendTitle    = CommonDefine.MaterualLimitItem[1, 0];
287 292
                    TermMasterData.SendMessage  = CommonDefine.MaterualLimitItem[1, 1];
......
298 303
        }
299 304
        #endregion
300 305

  
301
        #region 秘書からのメッセージ作成(資材管理メッセージ
306
        #region 秘書からのメッセージ作成(資材管理
302 307
        /// <summary>
303
        /// 秘書からのメッセージ作成(資材管理メッセージ
308
        /// 秘書からのメッセージ作成(資材管理
304 309
        /// </summary>
305 310
        private bool MakeSecretaryMassageData(IOMessageBoardData mbdDB,
306 311
                                        IOMessageBoardTerget mbtDB,
......
315 320
                strSQL += string.Format(" LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = {0}", wrkRec.PersonCode);
316 321
                strSQL += " , CONSTRUCTIONBASEINFODETAIL A";
317 322
                strSQL += string.Format(" WHERE P.CONSTRUCTIONCODE = {0}", wrkRec.ConstructionCode);
318
                strSQL += string.Format(" AND A.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE AND A.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
323
                strSQL += string.Format(" AND A.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE AND A.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
319 324
                ArrayList arList = new ArrayList();
320 325
                if (!cbiDB.ExecuteReader(strSQL, ref arList)) return false;
321 326

  
......
395 400
            IOMessageBoardData mbdDB = new IOMessageBoardData();
396 401
            IOMessageBoardTerget mbtDB = new IOMessageBoardTerget();
397 402

  
398
            string strSQL = "SELECT";
399
            strSQL += " t1.MaterialItemCode";
400
            strSQL += ", t1.ProcessDate";
401
            strSQL += ", t1.SeqNo";
402
            strSQL += ", t1.RecKind";
403
            strSQL += ", t1.ConstructionCode";
404
            strSQL += ", t1.PersonCode";
405
            strSQL += ", t1.MaterialCount";
406
            strSQL += ", MAX(t1.REPAYPLANDATE) AS RepayPlanDate";
407
            strSQL += ", t1.CommentText";
408
            strSQL += ", t1.EntryDate";
409
            strSQL += ", t1.UpdateDate";
410
            strSQL += " FROM";
411
            strSQL += " MATERIALRECORDINFO AS t1";
412
            strSQL += " INNER JOIN CONSTRUCTIONMATERIALINFO AS t2";
413
            strSQL += " ON t1.CONSTRUCTIONCODE = t2.CONSTRUCTIONCODE";
414
            strSQL += " AND t1.MATERIALITEMCODE = t2.MATERIALITEMCODE";
415
            strSQL += " AND t2.COMPLETEFLG = 0";
416
            strSQL += " WHERE";
417
            strSQL += " t1.CONSTRUCTIONCODE > 0";
418
            strSQL += " AND t1.CONSTRUCTIONCODE IS NOT NULL";
419
            strSQL += " AND t1.RECKIND = 0";
420
            strSQL += " AND t1.REPAYPLANDATE <= DATE_FORMAT(NOW(), '%Y/%m/%d')";
421
            strSQL += " GROUP BY";
422
            strSQL += " t1.CONSTRUCTIONCODE";
423
            strSQL += ", t1.PERSONCODE";
424
            strSQL += " ORDER BY";
425
            strSQL += " t1.CONSTRUCTIONCODE";
426
            strSQL += " , t1.REPAYPLANDATE";
403
            StringBuilder strSQL = new StringBuilder();
427 404

  
428 405
            try
429 406
            {
......
434 411

  
435 412
                bool procflg = true;
436 413

  
414
                CreateGetMaterialDataSQL(ref strSQL);
415

  
437 416
                // 資材履歴情報の返却未完了の貸出データを取得する
438 417
                IOMaterialRecordInfo mrDB = new IOMaterialRecordInfo();
439 418
                ArrayList mrData = new ArrayList();
440 419
                List<MaterialRecordInfo> data = new List<MaterialRecordInfo>();
441 420

  
442
                if (mrDB.ExecuteReader(strSQL, ref mrData))
421
                if (mrDB.ExecuteReader(strSQL.ToString(), ref mrData))
443 422
                {
444 423
                    foreach (object[] objwrk in mrData)
445 424
                    {
446 425
                        MaterialRecordInfo wrkRec = new MaterialRecordInfo();
447 426
                        mrDB.Reader2Struct(objwrk, ref wrkRec);
427

  
448 428
                        // チェック
449 429
                        TermMaster term = new TermMaster();
450
                        MaterualStatusCheck(wrkRec, StartDate, ref term);
430
                        MaterualStatusCheck(wrkRec, ref term);
451 431

  
452 432
                        // メッセージ作成 掲示板にメッセージを載せる処理
453 433
                        if (!MakeSecretaryMassageData(mbdDB, mbtDB, cbiDDB, wrkRec, term, StartDate))
......
491 471
        }
492 472
        #endregion
493 473

  
474
        #region 資材返却チェックデータ取得SQL作成
475
        /// <summary>
476
        /// 資材返却チェックデータ取得SQL作成
477
        /// </summary>
478
        /// <param name="strSQL"></param>
479
        private void CreateGetMaterialDataSQL(ref StringBuilder strSQL)
480
        {
481
            try
482
            {
483
                strSQL.Append("SELECT");
484
                strSQL.Append(" t1.MaterialItemCode");
485
                strSQL.Append(", t1.ProcessDate");
486
                strSQL.Append(", t1.SeqNo");
487
                strSQL.Append(", t1.RecKind");
488
                strSQL.Append(", t1.ConstructionCode");
489
                strSQL.Append(", t1.PersonCode");
490
                strSQL.Append(", t1.MaterialCount");
491
                strSQL.Append(", MAX(t1.REPAYPLANDATE) AS RepayPlanDate");
492
                strSQL.Append(", t1.CommentText");
493
                strSQL.Append(", t1.EntryDate");
494
                strSQL.Append(", t1.UpdateDate");
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

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