プロジェクト

全般

プロフィール

リビジョン 448

堀内約6年前に追加

工事予算入力:製品版フォーマット追加
工事詳細台帳:製品版フォーマット追加
工事日報:バグ修正
打合せ議事録:バグ修正
請求取消画面:外面変更
請求入力:回数追加条件修正
請求書印刷選択:画面修正
請求書印刷:印刷項目修正

差分を表示:

trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
208 208
                                                                                { (int)ProcessExecuteNo.ReqSumTotalList,        "手間・通常業者一覧-表示"},
209 209
                                                                                { (int)ProcessExecuteNo.RequestPrintList,       "請求書印刷一覧-表示"},
210 210
                                                                                { (int)ProcessExecuteNo.DepartmentCost,         "部署出納帳-入力" },
211
                                                                                { (int)ProcessExecuteNo.ReqApprovalStatus,      "請求承認状況閲覧-表示"}, // add suzuki 2018/08/08
211
                                                                                { (int)ProcessExecuteNo.ReqApprovalStatus,      "請求状況閲覧-表示"}, // add suzuki 2018/08/08
212 212
        };
213 213

  
214 214
        #endregion
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs
766 766
                //?R???g???[???I?u?W?F?N?g??
767 767
                SetDisplayObject();
768 768

  
769
                // ???i??\?????C?A?E?g??X????
770
                SetInitProductstyle();
771

  
769 772
                // ?\???N???A
770 773
                ClearDisplay();
771 774

  
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs
57 57
        }
58 58
        #endregion
59 59

  
60
        #region 製品版表示レイアウト変更処理
61
        /// <summary>
62
        /// 製品版表示レイアウト変更処理
63
        /// </summary>
64
        private void SetInitProductstyle()
65
        {
66
            try
67
            {
68
                switch (ProductDefine.ProductType)
69
                {
70
                    case (int)ProductDefine.ProductTypeDef.Originals:
71
                        // ----- オリジナル版
72
                        break;
73
                    case (int)ProductDefine.ProductTypeDef.MassProductionType1:
74
                        // ----- 製品版
75
                        label20.Visible = false;
76
                        label21.Visible = false;
77
                        pnlGroup2.Visible = false;
78
                        label12.Visible = false;
79
                        label13.Visible = false;
80
                        break;
81
                    default:
82
                        break;
83
                }
84
            }
85
            catch (Exception ex)
86
            {
87
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
88
            }
89
        }
90
        #endregion
91

  
60 92
        #region 画面サイズ変更時のセルサイズ変更
61 93
        /// <summary>
62 94
        /// 画面サイズ変更時のセルサイズ変更
......
1549 1581
                }
1550 1582
                else
1551 1583
                {
1552
                    // 製品版その他は人件費金額を表示する
1553
                    // 指導員給与
1554
                    CreateInstructorCosts(true);
1584
                    // 空行セット
1585
                    AddEmptyRow();
1555 1586

  
1556
                    // 副担当者給与経費
1557
                    CreateAssistantCosts(true);
1587
                    switch (ProductDefine.ProductType)
1588
                    {
1589
                        case (int)ProductDefine.ProductTypeDef.Originals:
1590
                            // ----- オリジナル
1591
                            // 指導員給与
1592
                            CreateInstructorCosts(true);
1558 1593

  
1594
                            // 副担当者給与経費
1595
                            CreateAssistantCosts(true);
1596
                            break;
1597
                        case (int)ProductDefine.ProductTypeDef.MassProductionType1:
1598
                            // ----- 製品版
1599
                            break;
1600
                        default:
1601
                            break;
1602
                    }
1603

  
1559 1604
                    // 担当者給与経費
1560 1605
                    CreatePayrollCosts(true);
1561 1606
                }
......
3191 3236
                if (!CheckUserAndLeader()) Content = string.Empty;
3192 3237

  
3193 3238
            GridSet:
3194
                // 空行セット
3195
                AddEmptyRow();
3196

  
3197 3239
                DataGridViewEX dgv = dgvAllDisplay;
3198 3240
                if (CreateRowLine)
3199 3241
                {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.cs
1072 1072
                //?R???g???[???I?u?W?F?N?g??
1073 1073
                SetDisplayObject();
1074 1074

  
1075
                // ???i??\?????C?A?E?g??X????
1076
                SetInitProductstyle();
1077

  
1075 1078
                // ?\???N???A
1076 1079
                ClearDisplay();
1077 1080

  
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
59 59
        }
60 60
        #endregion
61 61

  
62
        #region 製品版表示レイアウト変更処理
63
        /// <summary>
64
        /// 製品版表示レイアウト変更処理
65
        /// </summary>
66
        private void SetInitProductstyle()
67
        {
68
            try
69
            {
70
                switch (ProductDefine.ProductType)
71
                {
72
                    case (int)ProductDefine.ProductTypeDef.Originals:
73
                        // ----- オリジナル版
74
                        break;
75
                    case (int)ProductDefine.ProductTypeDef.MassProductionType1:
76
                        // ----- 製品版
77
                        label20.Visible = false;
78
                        label21.Visible = false;
79
                        pnlGroup2.Visible = false;
80
                        label12.Visible = false;
81
                        label13.Visible = false;
82
                        break;
83
                    default:
84
                        break;
85
                }
86
            }
87
            catch (Exception ex)
88
            {
89
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
90
            }
91
        }
92
        #endregion
93

  
62 94
        #region 工事情報取得処理
63 95
        /// <summary>
64 96
        /// 工事情報取得
......
2015 2047
                    nRetVal = CommonMotions.cnvInt(curRec[0]);
2016 2048
                }
2017 2049

  
2050
                int nSetRow = 0;
2051
                if (m_CostsRowCount[(int)CostsRowLine.InstructorRowLine] > 0)           // 8:指導員給料行
2052
                    nSetRow = m_CostsRowCount[(int)CostsRowLine.AssistantRowLine] - 1;
2053
                else if (m_CostsRowCount[(int)CostsRowLine.AssistantRowLine] > 0)       // 9:副担当者給料行
2054
                    nSetRow = m_CostsRowCount[(int)CostsRowLine.AssistantRowLine] - 1;
2055
                else if (m_CostsRowCount[(int)CostsRowLine.PayrollRowLine] > 0)         // 10:給料行
2056
                    nSetRow = m_CostsRowCount[(int)CostsRowLine.PayrollRowLine] - 1;
2057

  
2018 2058
                // 現場管理費を人件費タイトルへセットする
2019
                int nSetRow = m_CostsRowCount[(int)CostsRowLine.InstructorRowLine] - 1;
2020 2059
                dgvAllDisplay.Rows[nSetRow].Cells[(int)GridColumn.EstimatePrice].Value = nRetVal.ToString("#,#");
2021 2060
                dgvAllDisplay.Rows[nSetRow].Cells[(int)GridColumn.EstimatePrice].ToolTipText = "現 場 管 理 費";
2022 2061
            }
......
2391 2430
                // グループ名表示
2392 2431
                CreateTitleRow(GroupNo, s_PersonnelExpensesGroup);
2393 2432

  
2394
                // 指導員給与
2395
                GetDispDataFromConstructionBudget(DetailList, GroupNo, (int)FrmConstructionBudget.DataGroup.InstructorCosts, icnt++);
2396
                // 副担当者給与
2397
                GetDispDataFromConstructionBudget(DetailList, GroupNo, (int)FrmConstructionBudget.DataGroup.AssistantCosts, icnt++);
2433
                switch (ProductDefine.ProductType)
2434
                {
2435
                    case (int)ProductDefine.ProductTypeDef.Originals:
2436
                        // ----- オリジナル
2437
                        // 指導員給与
2438
                        GetDispDataFromConstructionBudget(DetailList, GroupNo, (int)FrmConstructionBudget.DataGroup.InstructorCosts, icnt++);
2439
                        // 副担当者給与
2440
                        GetDispDataFromConstructionBudget(DetailList, GroupNo, (int)FrmConstructionBudget.DataGroup.AssistantCosts, icnt++);
2441
                        break;
2442
                    case (int)ProductDefine.ProductTypeDef.MassProductionType1:
2443
                        // ----- 製品版
2444
                        break;
2445
                    default:
2446
                        break;
2447
                }
2448

  
2398 2449
                // 担当者給与経費
2399 2450
                GetDispDataFromConstructionBudget(DetailList, GroupNo, (int)FrmConstructionBudget.DataGroup.PayrollExpenses, icnt++);
2400 2451

  
......
3336 3387
                        CreateTitleRow(GroupNo, Titlestring);             // タイトル表示
3337 3388
                        icnt = 1;
3338 3389
                        break;
3339
                    case (int)DataGroup.Instructor:
3340
                        // 指導員給料行
3390

  
3391
                    case (int)DataGroup.Instructor:             // 指導員給料行
3392
                    case (int)DataGroup.Assistant:              // 副担当者
3393
                    case (int)DataGroup.Payroll:                // 給料行
3394
                        // 既にあるかのチェック
3395
                        if (CheckPaymentTitle()) break;
3396

  
3341 3397
                        AddEmptyRow();                                      // 空白行
3342 3398
                        Block = (int)DataGroup.TransportationCosts + 1;
3343 3399
                        CreateTitleRow(Block, s_PersonnelExpensesGroup);     // タイトル表示
......
3348 3404
                    case (int)DataGroup.ParkingCosts:            // 駐車場・資材置き場
3349 3405
                    case (int)DataGroup.RoomChargeCosts:         // 宿泊費
3350 3406
                    case (int)DataGroup.DisposeCosts:            // 処分費等
3351
                    case (int)DataGroup.Payroll:                 // 給料行
3352
                    case (int)DataGroup.Assistant:               // 副担当者
3353 3407
                        break;
3354 3408
                    default:
3355 3409
                        Block = 0;
......
3363 3417
        }
3364 3418
        #endregion
3365 3419

  
3420
        #region グリッドに人件費タイトル行が既にあるかのチェック
3421
        /// <summary>
3422
        /// グリッドに人件費タイトル行が既にあるかのチェック
3423
        /// </summary>
3424
        /// <returns></returns>
3425
        private bool CheckPaymentTitle()
3426
        {
3427
            try
3428
            {
3429
                DataGridView dgv = dgvAllDisplay;
3430
                bool bRet = false;
3431
                foreach(DataGridViewRow CurRow in dgv.Rows)
3432
                {
3433
                    int nNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.No].Value);
3434
                    if(nNo==((int)DataGroup.TransportationCosts + 1))
3435
                    {
3436
                        bRet = true;
3437
                        break;
3438
                    }
3439
                }
3440

  
3441
                return bRet;
3442
            }
3443
            catch (Exception ex)
3444
            {
3445
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
3446
                return false;
3447
            }
3448
        }
3449
        #endregion
3450

  
3366 3451
        #region 表示番号編集
3367 3452
        /// <summary>
3368 3453
        /// 表示番号編集
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.cs
1044 1044
            // ?f?[?^??X?L????f?[?^?o?^
1045 1045
            if (m_bChengeAns)
1046 1046
            {
1047
                if (!DataEntryProcess()) return;
1047
                if (!DataEntryProcess(false)) return;
1048 1048
            }
1049 1049

  
1050 1050
            // ?????f?[?^????????
......
1066 1066
            // ?f?[?^??X?L????f?[?^?o?^
1067 1067
            if (m_bChengeAns)
1068 1068
            {
1069
                if (!DataEntryProcess()) return;
1069
                if (!DataEntryProcess(false)) return;
1070 1070
            }
1071 1071

  
1072 1072
            // ??I??f?[?^????????
......
1088 1088
            // ?f?[?^??X?L????f?[?^?o?^
1089 1089
            if (m_bChengeAns)
1090 1090
            {
1091
                if (!DataEntryProcess()) return;
1091
                if (!DataEntryProcess(false)) return;
1092 1092
            }
1093 1093

  
1094 1094
            // ?O??f?[?^????????
......
1110 1110
            // ?f?[?^??X?L????f?[?^?o?^
1111 1111
            if (m_bChengeAns)
1112 1112
            {
1113
                if (!DataEntryProcess()) return;
1113
                if (!DataEntryProcess(false)) return;
1114 1114
            }
1115 1115

  
1116 1116
            // ???f?[?^????????
......
1129 1129
        /// <param name="e"></param>
1130 1130
        private void btnPetition_Click(object sender, EventArgs e)
1131 1131
        {
1132
            IODailyDataConstruction ConstDB = new IODailyDataConstruction();
1133 1132
            try
1134 1133
            {
1135
                // ??Z?\?Z?f?[?^??????????o?^????
1136
                DateTime dtWrk = CommonMotions.cnvDate(dTPCreateDate.Text);
1137
                string strSQL = ConstDB.CreatePrimarykeyString(m_PersonCode, dtWrk, m_ConstructionCode);
1138
                DailyDataConstruction DataRec = new DailyDataConstruction();
1139
                if (!ConstDB.SelectAction(strSQL, ref DataRec)) m_bChengeAns = true;
1140

  
1141
                // ?f?[?^??X?L????f?[?^?o?^
1142
                if (m_bChengeAns)
1134
                if (CommonMotions.OperationConfirmation())
1143 1135
                {
1144
                    if (!DataEntryProcess()) return;
1136
                    // ??l???F????
1137
                    if (!OneApprovalProcess()) return;
1145 1138
                }
1139
                else
1140
                {
1141
                    // ?I???W?i???\??????
1142
                    if (!PettionProcess()) return;
1143
                }
1146 1144

  
1147
                // ?N?????
1148
                int NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.ApprovalScreen);
1149

  
1150
                // ?H?????
1151
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_ConstructionBaseInfo.ConstructionCode);
1152

  
1153
                // ???F?@?\???
1154
                int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("?H??????F")).Key;
1155
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(iApprovalCode);
1156

  
1157
                // ??t???
1158
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonDefine.s_Default_OrderNo);
1159

  
1160 1145
                // ?e?t?H?[???I??
1161 1146
                m_ParentEnd = true;
1162 1147

  
......
1170 1155
            {
1171 1156
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
1172 1157
            }
1173
            finally
1174
            {
1175
                ConstDB.close(); ConstDB = null;
1176
            }
1177 1158
        }
1178 1159
        #endregion
1179 1160

  
......
1471 1452
                // ??X?O?l?Z?b?g
1472 1453
                if (dtCreateDateAfter != DateTime.MinValue) dTPCreateDate.Value = dtCreateDateAfter;
1473 1454
                // ?f?[?^?o?^
1474
                if (!DataEntryProcess())
1475
                {
1476
                    return;
1477
                }
1455
                if (!DataEntryProcess()) return;
1478 1456
            }
1479 1457
            // ???l?????l???????l????
1480 1458
            if (dTPCreateDate.Value != dtWork) dTPCreateDate.Value = dtWork;
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs
3505 3505
        }
3506 3506
        #endregion
3507 3507

  
3508
        #region オリジナル申請処理
3509
        /// <summary>
3510
        /// オリジナル申請処理
3511
        /// </summary>
3512
        /// <returns></returns>
3513
        private bool PettionProcess()
3514
        {
3515
            IODailyDataConstruction ConstDB = new IODailyDataConstruction();
3516
            try
3517
            {
3518
                // 日報データが無い場合は登録する
3519
                DateTime dtWrk = CommonMotions.cnvDate(dTPCreateDate.Text);
3520
                string strSQL = ConstDB.CreatePrimarykeyString(m_PersonCode, dtWrk, m_ConstructionCode);
3521
                DailyDataConstruction DataRec = new DailyDataConstruction();
3522
                if (!ConstDB.SelectAction(strSQL, ref DataRec)) m_bChengeAns = true;
3523

  
3524
                // データ変更有時はデータ登録
3525
                if (m_bChengeAns)
3526
                {
3527
                    if (!DataEntryProcess()) return false;
3528
                }
3529

  
3530
                // 起動番号
3531
                int NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.ApprovalScreen);
3532

  
3533
                // 工事番号
3534
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_ConstructionBaseInfo.ConstructionCode);
3535

  
3536
                // 承認機能番号
3537
                int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("工事日報承認")).Key;
3538
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(iApprovalCode);
3539

  
3540
                // 受付番号
3541
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonDefine.s_Default_OrderNo);
3542

  
3543
                return true;
3544
            }
3545
            catch (Exception ex)
3546
            {
3547
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
3548
                return false;
3549
            }
3550
            finally
3551
            {
3552
                ConstDB.close(); ConstDB = null;
3553
            }
3554
        }
3555
        #endregion
3556

  
3557
        #region 一人承認処理
3558
        /// <summary>
3559
        /// 一人承認処理
3560
        /// </summary>
3561
        /// <returns></returns>
3562
        private bool OneApprovalProcess()
3563
        {
3564
            FrmApprovalScreen frm = new FrmApprovalScreen();
3565
            IODailyDataConstruction ConstDB = new IODailyDataConstruction();
3566
            try
3567
            {
3568
                // 日報データが無い場合は登録する
3569
                DateTime dtWrk = CommonMotions.cnvDate(dTPCreateDate.Text);
3570
                string strSQL = ConstDB.CreatePrimarykeyString(m_PersonCode, dtWrk, m_ConstructionCode);
3571
                DailyDataConstruction DataRec = new DailyDataConstruction();
3572
                if (!ConstDB.SelectAction(strSQL, ref DataRec)) m_bChengeAns = true;
3573

  
3574
                // データ変更有時はデータ登録
3575
                if (m_bChengeAns)
3576
                {
3577
                    if (!DataEntryProcess()) return false;
3578
                }
3579

  
3580
                if (MessageBox.Show("確認処理を行います、確認後は変更できません。\r\nよろしいですか?", "処理確認"
3581
                                    , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return false;
3582

  
3583
                // 工事番号
3584
                frm.ConstructionCode = m_ConstructionCode;
3585
                // 承認機能番号セット
3586
                frm.ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("工事日報承認")).Key;
3587
                // 受付番号
3588
                frm.OrderNo = CommonDefine.s_Default_OrderNo;
3589

  
3590
                // 見えない画面を出す
3591
                frm.WindowState = FormWindowState.Minimized;
3592
                frm.Show();
3593
                // フォーム非表示
3594
                frm.Visible = false;
3595

  
3596
                // 申請・承認処理
3597
                if (!frm.OneApprovalProcess) return false;
3598

  
3599
                // 完了メッセージ
3600
                CommonMotions.EntryEndMessage("工事日報", "確認");
3601

  
3602
                return true;
3603
            }
3604
            catch (Exception ex)
3605
            {
3606
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
3607
                return false;
3608
            }
3609
            finally
3610
            {
3611
                // 画面を閉じる
3612
                frm.Close(); frm.Dispose(); frm = null;
3613
                ConstDB.close(); ConstDB = null;
3614
            }
3615
        }
3616
        #endregion
3617

  
3508 3618
        #region 明細グリッド:コピー
3509 3619
        /// <summary>
3510 3620
        /// 明細グリッド:コピー
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/FrmProceedings.cs
919 919
            // ?f?[?^??X?L????f?[?^?o?^
920 920
            if (m_bChengeAns)
921 921
            {
922
                if (!DataEntryProcess()) return;
922
                if (!DataEntryProcess(false)) return;
923 923
            }
924 924

  
925 925
            // ?????f?[?^????????
......
941 941
            // ?f?[?^??X?L????f?[?^?o?^
942 942
            if (m_bChengeAns)
943 943
            {
944
                if (!DataEntryProcess()) return;
944
                if (!DataEntryProcess(false)) return;
945 945
            }
946 946

  
947 947
            // ?O??f?[?^????????
......
963 963
            // ?f?[?^??X?L????f?[?^?o?^
964 964
            if (m_bChengeAns)
965 965
            {
966
                if (!DataEntryProcess()) return;
966
                if (!DataEntryProcess(false)) return;
967 967
            }
968 968

  
969 969
            // ???f?[?^????????
......
985 985
            // ?f?[?^??X?L????f?[?^?o?^
986 986
            if (m_bChengeAns)
987 987
            {
988
                if (!DataEntryProcess()) return;
988
                if (!DataEntryProcess(false)) return;
989 989
            }
990 990

  
991 991
            // ??I??f?[?^????????
......
1004 1004
        /// <param name="e"></param>
1005 1005
        private void btnPetition_Click(object sender, EventArgs e)
1006 1006
        {
1007
            IOProceedingsData ProDB = new IOProceedingsData();
1008 1007
            try
1009 1008
            {
1010
                // ?c???f?[?^??????????o?^????
1011
                int StartTime = (int)((numUD1.Value *100)+numUD2.Value);
1012
                string strSQL = ProDB.CreatePrimarykeyString(m_ConstructionCode, dtMeetingDate.Value, StartTime);
1013
                ProceedingsData DataRec = new ProceedingsData();
1014
                if (!ProDB.SelectAction(strSQL, ref DataRec)) m_bChengeAns = true;
1015

  
1016
                // ?f?[?^??X?L????f?[?^?o?^
1017
                if (m_bChengeAns)
1009
                if (CommonMotions.OperationConfirmation())
1018 1010
                {
1019
                    if (!DataEntryProcess()) return;
1011
                    // ??l???F????
1012
                    if (!OneApprovalProcess()) return;
1020 1013
                }
1014
                else
1015
                {
1016
                    // ?I???W?i???\??????
1017
                    if (!PettionProcess()) return;
1018
                }
1021 1019

  
1022
                // ?N?????
1023
                int NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.ApprovalScreen);
1024

  
1025
                // ?H?????
1026
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_ConstructionCode);
1027

  
1028
                // ???F?@?\???
1029
                int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("?c???^???F")).Key;
1030
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(iApprovalCode);
1031

  
1032
                // ??t???
1033
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonDefine.s_Default_OrderNo);
1034

  
1035 1020
                // ?e?t?H?[???I??
1036 1021
                m_ParentEnd = true;
1037 1022

  
......
1045 1030
            {
1046 1031
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
1047 1032
            }
1048
            finally
1049
            {
1050
                ProDB.close(); ProDB = null;
1051
            }
1052 1033
        }
1053 1034
        #endregion
1054 1035

  
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/FrmProceedingsAuxiliary.cs
440 440
        /// 登録ボタン押下後の登録処理
441 441
        /// </summary>
442 442
        /// <returns></returns>
443
        private bool DataEntryProcess()
443
        private bool DataEntryProcess(bool bMsgDisp = true)
444 444
        {
445 445
            IOProceedingsData ProDB = new IOProceedingsData();
446 446
            IOProceedingsDataAttend AttendDB = new IOProceedingsDataAttend();
......
450 450
                //データチェック
451 451
                if (!DispFeildCheck()) return false;
452 452

  
453
                if (MessageBox.Show("議事録データを更新します、よろしいですか?", "登録確認"
454
                                    , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return false;
453
                if (bMsgDisp)
454
                {
455
                    if (MessageBox.Show("議事録データを更新します、よろしいですか?", "登録確認"
456
                                        , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return false;
457
                }
455 458

  
456 459
                ProDB.connect(); ProDB.beginTran();
457 460
                AttendDB.connect(); AttendDB.beginTran();
......
1482 1485
        }
1483 1486
        #endregion
1484 1487

  
1488
        #region オリジナル申請処理
1489
        /// <summary>
1490
        /// オリジナル申請処理
1491
        /// </summary>
1492
        /// <returns></returns>
1493
        private bool PettionProcess()
1494
        {
1495
            IOProceedingsData ProDB = new IOProceedingsData();
1496
            try
1497
            {
1498
                // 議事データが無い場合は登録する
1499
                int StartTime = (int)((numUD1.Value * 100) + numUD2.Value);
1500
                string strSQL = ProDB.CreatePrimarykeyString(m_ConstructionCode, dtMeetingDate.Value, StartTime);
1501
                ProceedingsData DataRec = new ProceedingsData();
1502
                if (!ProDB.SelectAction(strSQL, ref DataRec)) m_bChengeAns = true;
1503

  
1504
                // データ変更有時はデータ登録
1505
                if (m_bChengeAns)
1506
                {
1507
                    if (!DataEntryProcess()) return false;
1508
                }
1509

  
1510
                // 起動番号
1511
                int NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.ApprovalScreen);
1512

  
1513
                // 工事番号
1514
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_ConstructionCode);
1515

  
1516
                // 承認機能番号
1517
                int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("議事録承認")).Key;
1518
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(iApprovalCode);
1519

  
1520
                // 受付番号
1521
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonDefine.s_Default_OrderNo);
1522

  
1523
                return true;
1524
            }
1525
            catch (Exception ex)
1526
            {
1527
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1528
                return false;
1529
            }
1530
            finally
1531
            {
1532
                ProDB.close(); ProDB = null;
1533
            }
1534
        }
1535
        #endregion
1536

  
1537
        #region 一人承認処理
1538
        /// <summary>
1539
        /// 一人承認処理
1540
        /// </summary>
1541
        /// <returns></returns>
1542
        private bool OneApprovalProcess()
1543
        {
1544
            FrmApprovalScreen frm = new FrmApprovalScreen();
1545
            IOProceedingsData ProDB = new IOProceedingsData();
1546
            try
1547
            {
1548
                // 議事データが無い場合は登録する
1549
                int StartTime = (int)((numUD1.Value * 100) + numUD2.Value);
1550
                string strSQL = ProDB.CreatePrimarykeyString(m_ConstructionCode, dtMeetingDate.Value, StartTime);
1551
                ProceedingsData DataRec = new ProceedingsData();
1552
                if (!ProDB.SelectAction(strSQL, ref DataRec)) m_bChengeAns = true;
1553

  
1554
                // データ変更有時はデータ登録
1555
                if (m_bChengeAns)
1556
                {
1557
                    if (!DataEntryProcess()) return false;
1558
                }
1559

  
1560
                if (MessageBox.Show("確認処理を行います、確認後は変更できません。\r\nよろしいですか?", "処理確認"
1561
                                    , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return false;
1562

  
1563
                // 工事番号
1564
                frm.ConstructionCode = m_ConstructionCode;
1565
                // 承認機能番号セット
1566
                frm.ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("議事録承認")).Key;
1567
                // 受付番号
1568
                frm.OrderNo = CommonDefine.s_Default_OrderNo;
1569

  
1570
                // 見えない画面を出す
1571
                frm.WindowState = FormWindowState.Minimized;
1572
                frm.Show();
1573
                // フォーム非表示
1574
                frm.Visible = false;
1575

  
1576
                // 申請・承認処理
1577
                if (!frm.OneApprovalProcess) return false;
1578

  
1579
                // 完了メッセージ
1580
                CommonMotions.EntryEndMessage("議事録", "確認");
1581

  
1582
                return true;
1583
            }
1584
            catch (Exception ex)
1585
            {
1586
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1587
                return false;
1588
            }
1589
            finally
1590
            {
1591
                // 画面を閉じる
1592
                frm.Close(); frm.Dispose(); frm = null;
1593
                ProDB.close(); ProDB = null;
1594
            }
1595
        }
1596
        #endregion
1597

  
1485 1598
        // -------------------- 印刷処理
1486 1599
        #region 印刷時ボタン制御
1487 1600
        /// <summary>
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmCancelDisplay.Designer.cs
33 33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
34 34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
35 35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
36 38
            this.btnEnd = new System.Windows.Forms.Button();
37 39
            this.dgvMain = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
38 40
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
39 41
            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
40 42
            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
43
            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
44
            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
41 45
            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
42 46
            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
43 47
            ((System.ComponentModel.ISupportInitialize)(this.dgvMain)).BeginInit();
......
48 52
            this.btnEnd.BackColor = System.Drawing.Color.Blue;
49 53
            this.btnEnd.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
50 54
            this.btnEnd.ForeColor = System.Drawing.Color.White;
51
            this.btnEnd.Location = new System.Drawing.Point(872, 176);
55
            this.btnEnd.Location = new System.Drawing.Point(1072, 176);
52 56
            this.btnEnd.Name = "btnEnd";
53 57
            this.btnEnd.Size = new System.Drawing.Size(120, 30);
54 58
            this.btnEnd.TabIndex = 3;
......
77 81
            this.Column1,
78 82
            this.Column2,
79 83
            this.Column3,
84
            this.Column6,
85
            this.Column7,
80 86
            this.Column4,
81 87
            this.Column5});
82 88
            this.dgvMain.EnableHeadersVisualStyles = false;
......
86 92
            this.dgvMain.RowHeadersWidth = 20;
87 93
            this.dgvMain.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
88 94
            this.dgvMain.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
89
            this.dgvMain.Size = new System.Drawing.Size(990, 172);
95
            this.dgvMain.Size = new System.Drawing.Size(1190, 172);
90 96
            this.dgvMain.TabIndex = 0;
91 97
            // 
92 98
            // Column1
......
130 136
            this.Column3.ReadOnly = true;
131 137
            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
132 138
            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
133
            this.Column3.Width = 200;
139
            this.Column3.Width = 150;
134 140
            // 
141
            // Column6
142
            // 
143
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
144
            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
145
            this.Column6.DefaultCellStyle = dataGridViewCellStyle5;
146
            this.Column6.HeaderText = "請求金額";
147
            this.Column6.Name = "Column6";
148
            this.Column6.ReadOnly = true;
149
            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
150
            this.Column6.Width = 150;
151
            // 
152
            // Column7
153
            // 
154
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
155
            dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold);
156
            this.Column7.DefaultCellStyle = dataGridViewCellStyle6;
157
            this.Column7.HeaderText = "消費税";
158
            this.Column7.Name = "Column7";
159
            this.Column7.ReadOnly = true;
160
            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
161
            this.Column7.Width = 150;
162
            // 
135 163
            // Column4
136 164
            // 
137
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
138
            dataGridViewCellStyle5.BackColor = System.Drawing.Color.White;
139
            dataGridViewCellStyle5.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
140
            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Black;
141
            dataGridViewCellStyle5.Format = "C0";
142
            dataGridViewCellStyle5.NullValue = null;
143
            this.Column4.DefaultCellStyle = dataGridViewCellStyle5;
165
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
166
            dataGridViewCellStyle7.BackColor = System.Drawing.Color.White;
167
            dataGridViewCellStyle7.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
168
            dataGridViewCellStyle7.ForeColor = System.Drawing.Color.Black;
169
            dataGridViewCellStyle7.Format = "C0";
170
            dataGridViewCellStyle7.NullValue = null;
171
            this.Column4.DefaultCellStyle = dataGridViewCellStyle7;
144 172
            this.Column4.HeaderText = "取 消 理 由";
145 173
            this.Column4.Name = "Column4";
146 174
            this.Column4.ReadOnly = true;
147 175
            this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
148 176
            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
149
            this.Column4.Width = 570;
177
            this.Column4.Width = 520;
150 178
            // 
151 179
            // Column5
152 180
            // 
......
161 189
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
162 190
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
163 191
            this.BackColor = System.Drawing.Color.Black;
164
            this.ClientSize = new System.Drawing.Size(994, 206);
192
            this.ClientSize = new System.Drawing.Size(1194, 206);
165 193
            this.ControlBox = false;
166 194
            this.Controls.Add(this.dgvMain);
167 195
            this.Controls.Add(this.btnEnd);
......
188 216
        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
189 217
        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
190 218
        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
219
        private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
220
        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
191 221
        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
192 222
        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
193 223
    }
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmCancelDisplay.cs
177 177
                strSQL.Append(", A.RemoveComment");
178 178
                strSQL.Append(", A.RemoveNo");
179 179
                strSQL.Append(", A.ReqConstructionCode");
180
                strSQL.Append(", A.RequestAmount");
181
                strSQL.Append(", A.TaxAmount");
180 182
                strSQL.Append(" From removerequest As A");
181 183
                strSQL.Append(" left Join personinchargemaster As B");
182 184
                strSQL.Append("       On B.PersonCode = A.RemovePersonCode");
......
194 196
                    string strWork = CommonMotions.cnvString(objRec[0]);
195 197
                    CurRow.Cells[1].Value = string.Format("{0}/{1}/{2}", strWork.Substring(0, 4), strWork.Substring(4, 2), strWork.Substring(6, 2));
196 198
                    CurRow.Cells[2].Value = CommonMotions.cnvString(objRec[2]);
197
                    CurRow.Cells[3].Value = CommonMotions.cnvString(objRec[3]);
198
                    CurRow.Cells[4].Value = CommonMotions.cnvString(objRec[4]);
199
                    CurRow.Cells[3].Value = CommonMotions.cnvInt(objRec[6]).ToString("#,0");
200
                    CurRow.Cells[4].Value = CommonMotions.cnvInt(objRec[7]).ToString("#,0");
201
                    CurRow.Cells[5].Value = CommonMotions.cnvString(objRec[3]);
202
                    CurRow.Cells[6].Value = CommonMotions.cnvString(objRec[4]);
199 203
                }
200 204
            }
201 205
            catch (System.Exception ex)
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmCancelDisplay.resx
126 126
  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
127 127
    <value>True</value>
128 128
  </metadata>
129
  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
130
    <value>True</value>
131
  </metadata>
132
  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
133
    <value>True</value>
134
  </metadata>
129 135
  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
130 136
    <value>True</value>
131 137
  </metadata>
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs
2490 2490
                    return false;
2491 2491
                }
2492 2492

  
2493
                // 入金が完了している場合
2494
                if (m_ConstructionLedger.ComplateFlg == 1)
2493
                // 台帳が完了している場合
2494
                if (m_ConstructionLedger.ComplateFlg == (int)ConstructionLedger.CompFlagDef.Complated)
2495 2495
                {
2496 2496
                    return false;
2497 2497
                }
......
2503 2503
                }
2504 2504

  
2505 2505
                // 分割払いの場合
2506
                if (m_BaseConstructionBaseInfo.BillingSplitFlg == 1)
2507
                {
2508

  
2509
                    return true;
2510
                }
2511

  
2512 2506
                // 未入金が残っている場合
2513
                if (m_lUnpaidAmount > 0)
2507
                if (m_BaseConstructionBaseInfo.BillingSplitFlg == (int)ConstructionBaseInfo.BillingSplitFlgDef.SplitBilling
2508
                    && m_lUnpaidAmount > 0)
2514 2509
                {
2515 2510
                    return true;
2516 2511
                }
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.Designer.cs
34 34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
35 35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
36 36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
37 38
            this.label4 = new System.Windows.Forms.Label();
38 39
            this.lbReqMonth = new System.Windows.Forms.Label();
39 40
            this.label2 = new System.Windows.Forms.Label();
......
44 45
            this.PrintProgress = new System.Windows.Forms.ProgressBar();
45 46
            this.lbTotalAmount = new System.Windows.Forms.Label();
46 47
            this.dgv1 = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
47
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
48
            this.col1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
49
            this.col2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
50
            this.col3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
51
            this.col4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
52
            this.col5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
53
            this.col6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
54 48
            this.label8 = new System.Windows.Forms.Label();
55 49
            this.label7 = new System.Windows.Forms.Label();
56 50
            this.lbSelect = new System.Windows.Forms.Label();
......
61 55
            this.lblProcessTitil = new System.Windows.Forms.Label();
62 56
            this.btnCancel = new System.Windows.Forms.Button();
63 57
            this.lblCellTotal = new System.Windows.Forms.Label();
58
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
59
            this.col1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
60
            this.col2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
61
            this.col3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
62
            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
63
            this.col4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
64
            this.col5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
65
            this.col6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
64 66
            this.panel1.SuspendLayout();
65 67
            ((System.ComponentModel.ISupportInitialize)(this.dgv1)).BeginInit();
66 68
            this.panel2.SuspendLayout();
......
209 211
            this.col1,
210 212
            this.col2,
211 213
            this.col3,
214
            this.Column2,
212 215
            this.col4,
213 216
            this.col5,
214 217
            this.col6});
......
223 226
            this.dgv1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv1_CellContentClick);
224 227
            this.dgv1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgv1_MouseUp);
225 228
            // 
226
            // Column1
227
            // 
228
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
229
            dataGridViewCellStyle2.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
230
            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
231
            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
232
            this.Column1.Frozen = true;
233
            this.Column1.HeaderText = "№";
234
            this.Column1.Name = "Column1";
235
            this.Column1.ReadOnly = true;
236
            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
237
            this.Column1.Width = 60;
238
            // 
239
            // col1
240
            // 
241
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
242
            dataGridViewCellStyle3.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
243
            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black;
244
            dataGridViewCellStyle3.NullValue = false;
245
            this.col1.DefaultCellStyle = dataGridViewCellStyle3;
246
            this.col1.Frozen = true;
247
            this.col1.HeaderText = "";
248
            this.col1.Name = "col1";
249
            this.col1.Width = 30;
250
            // 
251
            // col2
252
            // 
253
            this.col2.HeaderText = "請 求 案 件";
254
            this.col2.Name = "col2";
255
            this.col2.ReadOnly = true;
256
            this.col2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
257
            this.col2.Width = 830;
258
            // 
259
            // col3
260
            // 
261
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
262
            dataGridViewCellStyle4.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
263
            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
264
            this.col3.DefaultCellStyle = dataGridViewCellStyle4;
265
            this.col3.HeaderText = "請 求 金 額";
266
            this.col3.Name = "col3";
267
            this.col3.ReadOnly = true;
268
            this.col3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
269
            this.col3.Width = 160;
270
            // 
271
            // col4
272
            // 
273
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
274
            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
275
            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Black;
276
            this.col4.DefaultCellStyle = dataGridViewCellStyle5;
277
            this.col4.HeaderText = "請求書作成日";
278
            this.col4.Name = "col4";
279
            this.col4.ReadOnly = true;
280
            this.col4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
281
            this.col4.Width = 140;
282
            // 
283
            // col5
284
            // 
285
            this.col5.HeaderText = "RequestNo";
286
            this.col5.Name = "col5";
287
            this.col5.ReadOnly = true;
288
            this.col5.Visible = false;
289
            // 
290
            // col6
291
            // 
292
            this.col6.HeaderText = "InvoiceNo";
293
            this.col6.Name = "col6";
294
            this.col6.ReadOnly = true;
295
            this.col6.Visible = false;
296
            // 
297 229
            // label8
298 230
            // 
299 231
            this.label8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
......
429 361
            this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
430 362
            this.lblCellTotal.TabIndex = 45;
431 363
            // 
364
            // Column1
365
            // 
366
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
367
            dataGridViewCellStyle2.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
368
            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
369
            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
370
            this.Column1.Frozen = true;
371
            this.Column1.HeaderText = "№";
372
            this.Column1.Name = "Column1";
373
            this.Column1.ReadOnly = true;
374
            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
375
            this.Column1.Width = 60;
376
            // 
377
            // col1
378
            // 
379
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
380
            dataGridViewCellStyle3.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
381
            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black;
382
            dataGridViewCellStyle3.NullValue = false;
383
            this.col1.DefaultCellStyle = dataGridViewCellStyle3;
384
            this.col1.Frozen = true;
385
            this.col1.HeaderText = "";
386
            this.col1.Name = "col1";
387
            this.col1.Width = 30;
388
            // 
389
            // col2
390
            // 
391
            this.col2.HeaderText = "請 求 案 件";
392
            this.col2.Name = "col2";
393
            this.col2.ReadOnly = true;
394
            this.col2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
395
            this.col2.Width = 670;
396
            // 
397
            // col3
398
            // 
399
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
400
            dataGridViewCellStyle4.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
401
            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
402
            this.col3.DefaultCellStyle = dataGridViewCellStyle4;
403
            this.col3.HeaderText = "請求金額(税抜)";
404
            this.col3.Name = "col3";
405
            this.col3.ReadOnly = true;
406
            this.col3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
407
            this.col3.Width = 160;
408
            // 
409
            // Column2
410
            // 
411
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
412
            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold);
413
            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Black;
414
            this.Column2.DefaultCellStyle = dataGridViewCellStyle5;
415
            this.Column2.HeaderText = "請求金額(税込)";
416
            this.Column2.Name = "Column2";
417
            this.Column2.ReadOnly = true;
418
            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
419
            this.Column2.Width = 160;
420
            // 
421
            // col4
422
            // 
423
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
424
            dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
425
            dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black;
426
            this.col4.DefaultCellStyle = dataGridViewCellStyle6;
427
            this.col4.HeaderText = "請求書作成日";
428
            this.col4.Name = "col4";
429
            this.col4.ReadOnly = true;
430
            this.col4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
431
            this.col4.Width = 140;
432
            // 
433
            // col5
434
            // 
435
            this.col5.HeaderText = "RequestNo";
436
            this.col5.Name = "col5";
437
            this.col5.ReadOnly = true;
438
            this.col5.Visible = false;
439
            // 
440
            // col6
441
            // 
442
            this.col6.HeaderText = "InvoiceNo";
443
            this.col6.Name = "col6";
444
            this.col6.ReadOnly = true;
445
            this.col6.Visible = false;
446
            // 
432 447
            // FrmRequestPrintSel
433 448
            // 
434 449
            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 15F);
......
482 497
        private System.Windows.Forms.Label lblProcessTitil;
483 498
        private System.Windows.Forms.ProgressBar PrintProgress;
484 499
        private System.Windows.Forms.Button btnCancel;
500
        private System.Windows.Forms.Label lblCellTotal;
485 501
        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
486 502
        private System.Windows.Forms.DataGridViewCheckBoxColumn col1;
487 503
        private System.Windows.Forms.DataGridViewTextBoxColumn col2;
488 504
        private System.Windows.Forms.DataGridViewTextBoxColumn col3;
505
        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
489 506
        private System.Windows.Forms.DataGridViewTextBoxColumn col4;
490 507
        private System.Windows.Forms.DataGridViewTextBoxColumn col5;
491 508
        private System.Windows.Forms.DataGridViewTextBoxColumn col6;
492
        private System.Windows.Forms.Label lblCellTotal;
493 509
    }
494 510
}
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.cs
47 47
            CheckFlg,
48 48
            RequestTitle,
49 49
            ReqValue,
50
            ReqValueInTax,
50 51
            CreateDate,
51 52
            RequestNo,
52 53
            InvoiceNo,
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSel.resx
129 129
  <metadata name="col3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
130 130
    <value>True</value>
131 131
  </metadata>
132
  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
133
    <value>True</value>
134
  </metadata>
132 135
  <metadata name="col4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
133 136
    <value>True</value>
134 137
  </metadata>
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSelAux.cs
250 250
                    }
251 251
                    CurRow.Cells[(int)DispColumn.RequestTitle].Value = strConstrName;
252 252
                    CurRow.Cells[(int)DispColumn.ReqValue].Value = ReqHead.RequestAmount.ToString("#,0");
253
                    CurRow.Cells[(int)DispColumn.ReqValueInTax].Value = (ReqHead.RequestAmount+ ReqHead.TaxAmount).ToString("#,0");
253 254
                    CurRow.Cells[(int)DispColumn.RequestNo].Value = ReqHead.RequestNo;
254 255

  
255 256
                    // 印刷未は以下を処理しない
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSelPrtOut.cs
8 8
using System.Text;
9 9
using System.Threading.Tasks;
10 10
using System.Windows.Forms;
11
using Microsoft.VisualBasic;
11 12

  
12 13
using ProcessManagement.Common;
13 14
using ProcessManagement.DataModel;
......
16 17
using ProcessManagement.Forms.SubForms;
17 18
using ProcessManagement.Forms.ControlsAction;
18 19

  
19

  
20 20
namespace ProcessManagement.Forms.DataEntry
21 21
{
22 22
    public partial class FrmRequestPrintSel
......
547 547
                this.Invoke(m_progressDlg, new object[] { ++m_ProgressCount });
548 548

  
549 549
                int no = 1;
550
                int nPageNo = 1;
550 551
                foreach (RequestHead ReqHead in m_lstReqHead)
551 552
                {
552 553
                    List<RequestData> lstReqData = null;
553 554
                    if (!m_dicReqData.TryGetValue(ReqHead.RequestNo, out lstReqData)) continue;
554
                    //{
555
                    //    m_rtAns = rtAns;
556
                    //    return;
557
                    //}
558 555

  
559 556
                    foreach (RequestData ReqData in lstReqData)
560 557
                    {
561 558
                        if (!m_dicConstructionBaseInfo.TryGetValue(ReqData.MainConstructionCode, out ConstructionBaseInfo Info)) continue;
562
                        //{
563
                        //    m_rtAns = CommonDefine.RetunAnswer.Answer2;
564
                        //    return;
565
                        //}
566 559

  
567 560
                        long lRequestAmount = ReqData.RequestAmount0;
568 561
                        lRequestAmount += ReqData.RequestAmount1;
......
573 566
                        lRequestAmount += ReqData.RequestAmount6;
574 567
                        lRequestAmount += ReqData.UnpaidAmount;
575 568

  
576
                        if (lRequestAmount == 0)
577
                        {
578
                            continue;
579
                        }
569
                        if (lRequestAmount == 0) continue;
580 570

  
581
                        rtAns = PrintDetail(no, ReqHead, ReqData, Info);
571
                        rtAns = PrintDetail(no, ReqHead, ReqData, Info, nPageNo);
582 572
                        if (rtAns != CommonDefine.RetunAnswer.Answer0)
583 573
                        {
584 574
                            m_rtAns = rtAns;
585 575
                            return;
586 576
                        }
577

  
587 578
                        // 中断処理
588 579
                        if (m_Canceled) return;
589 580

  
590 581
                        // コントロールの表示を変更する
591 582
                        this.Invoke(m_progressDlg, new object[] { ++m_ProgressCount });
583
                        nPageNo++;
592 584
                    }
593 585
                }
594 586

  
......
1062 1054
                        ExcelPrnData.AddPrintData("D", trow, lAmount.ToString("#,0"));                                  // 請求金額
1063 1055

  
1064 1056
                        ExcelPrnData.AddPrintData("E", trow, ReqData.Note);                                             // 備考
1057
                        ExcelPrnData.AddPrintData("A", 34, CommonMotions.SystemMasterData.CompanyName1.Trim());         // フッダー
1065 1058
                        ExcelPrnData.ExcelCellSet(m_UsedExcel);
1066 1059

  
1067 1060
                        trow += 3;
......
1069 1062
                    }
1070 1063
                }
1071 1064

  
1065

  
1072 1066
                return CommonDefine.RetunAnswer.Answer0;
1073 1067
            }
1074 1068
            catch (Exception ex)
......
1090 1084
        private CommonDefine.RetunAnswer PrintDetail(int no
1091 1085
                                                    , RequestHead ReqHead
1092 1086
                                                    , RequestData ReqData
1093
                                                    , ConstructionBaseInfo Info)
1087
                                                    , ConstructionBaseInfo Info
1088
                                                    , int nPageNo)
1094 1089
        {
1095 1090
            try
1096 1091
            {
......
1099 1094

  
1100 1095
                ExcelPrintData ExcelPrnData = null;
1101 1096

  
1097
                // ------------------------------- ページ№ -------------------------------
1098
                ExcelPrnData = new ExcelPrintData();
1099
                string strPrtOut = "No" + Strings.StrConv(nPageNo.ToString(), VbStrConv.Wide, 0);
1100
                ExcelPrnData.AddPrintData("H", 1, strPrtOut).ExcelCellSet(m_UsedExcel);
1101

  
1102 1102
                // ------------------------------- 工事名 -------------------------------
1103 1103
                // ① 工事件名
1104 1104
                ExcelPrnData = new ExcelPrintData();
......
1207 1207
                ExcelPrnData.AddPrintData("G", 25, lTotalAmount.ToString("#,0"));
1208 1208
                ExcelPrnData.ExcelCellSet(m_UsedExcel);
1209 1209

  
1210
                // ------------------------------- フッダー -------------------------------
1211
                ExcelPrnData.AddPrintData("A", 27, CommonMotions.SystemMasterData.CompanyName1.Trim());
1212
                ExcelPrnData.ExcelCellSet(m_UsedExcel);
1213

  
1210 1214
                return CommonDefine.RetunAnswer.Answer0;
1211 1215
            }
1212 1216
            catch (Exception ex)
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrintList/FrmReqPrintList.designer.cs
371 371
            dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
372 372
            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.Black;
373 373
            this.Column10.DefaultCellStyle = dataGridViewCellStyle8;
374
            this.Column10.HeaderText = "未印刷金額";
374
            this.Column10.HeaderText = "未印刷金額(税抜)";
375 375
            this.Column10.Name = "Column10";
376 376
            this.Column10.ReadOnly = true;
377 377
            this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
383 383
            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
384 384
            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Black;
385 385
            this.Column6.DefaultCellStyle = dataGridViewCellStyle9;
386
            this.Column6.HeaderText = "印刷済金額";
386
            this.Column6.HeaderText = "印刷済金額(税抜)";
387 387
            this.Column6.Name = "Column6";
388 388
            this.Column6.ReadOnly = true;
389 389
            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.Designer.cs
5150 5150
            this.tblLayoutConstruction.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F));
5151 5151
            this.tblLayoutConstruction.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F));
5152 5152
            this.tblLayoutConstruction.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F));
5153
            this.tblLayoutConstruction.Size = new System.Drawing.Size(1068, 1224);
5153
            this.tblLayoutConstruction.Size = new System.Drawing.Size(1034, 1224);
5154 5154
            this.tblLayoutConstruction.TabIndex = 15;
5155 5155
            // 
5156 5156
            // lblConstrLine01
......
5160 5160
            this.tblLayoutConstruction.SetColumnSpan(this.lblConstrLine01, 10);
5161 5161
            this.lblConstrLine01.Location = new System.Drawing.Point(3, 267);
5162 5162
            this.lblConstrLine01.Name = "lblConstrLine01";
5163
            this.lblConstrLine01.Size = new System.Drawing.Size(1062, 6);
5163
            this.lblConstrLine01.Size = new System.Drawing.Size(1028, 6);
5164 5164
            this.lblConstrLine01.TabIndex = 15;
5165 5165
            // 
5166 5166
            // btnConstruction0000
5167 5167
            // 
5168 5168
            this.btnConstruction0000.Dock = System.Windows.Forms.DockStyle.Fill;
5169
            this.btnConstruction0000.Location = new System.Drawing.Point(98, 39);
5169
            this.btnConstruction0000.Location = new System.Drawing.Point(95, 39);
5170 5170
            this.btnConstruction0000.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
5171 5171
            this.btnConstruction0000.Name = "btnConstruction0000";
5172
            this.btnConstruction0000.Size = new System.Drawing.Size(172, 30);
5172
            this.btnConstruction0000.Size = new System.Drawing.Size(167, 30);
5173 5173
            this.btnConstruction0000.TabIndex = 15;
5174 5174
            this.btnConstruction0000.Text = "各工事詳細台帳閲覧";
5175 5175
            this.btnConstruction0000.UseVisualStyleBackColor = true;
......
5182 5182
            | System.Windows.Forms.AnchorStyles.Right)));
5183 5183
            this.lblConstrTitle01.AutoSize = true;
5184 5184
            this.lblConstrTitle01.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
5185
            this.lblConstrTitle01.Location = new System.Drawing.Point(97, 0);
5185
            this.lblConstrTitle01.Location = new System.Drawing.Point(94, 0);
5186 5186
            this.lblConstrTitle01.Name = "lblConstrTitle01";
5187
            this.lblConstrTitle01.Size = new System.Drawing.Size(174, 36);
5187
            this.lblConstrTitle01.Size = new System.Drawing.Size(169, 36);
5188 5188
            this.lblConstrTitle01.TabIndex = 15;
5189 5189
            this.lblConstrTitle01.Text = "日次(施工)管理";
5190 5190
            this.lblConstrTitle01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......
5198 5198
            this.lblConstr00.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
5199 5199
            this.lblConstr00.Location = new System.Drawing.Point(3, 36);
5200 5200
            this.lblConstr00.Name = "lblConstr00";
5201
            this.lblConstr00.Size = new System.Drawing.Size(88, 36);
5201
            this.lblConstr00.Size = new System.Drawing.Size(85, 36);
5202 5202
            this.lblConstr00.TabIndex = 15;
5203 5203
            this.lblConstr00.Text = "毎日";
5204 5204
            this.lblConstr00.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......
5206 5206
            // btnConstruction0001
5207 5207
            // 
5208 5208
            this.btnConstruction0001.Dock = System.Windows.Forms.DockStyle.Fill;
5209
            this.btnConstruction0001.Location = new System.Drawing.Point(295, 39);
5209
            this.btnConstruction0001.Location = new System.Drawing.Point(286, 39);
5210 5210
            this.btnConstruction0001.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
5211 5211
            this.btnConstruction0001.Name = "btnConstruction0001";
5212
            this.btnConstruction0001.Size = new System.Drawing.Size(172, 30);
5212
            this.btnConstruction0001.Size = new System.Drawing.Size(167, 30);
5213 5213
            this.btnConstruction0001.TabIndex = 15;
5214 5214
            this.btnConstruction0001.Text = "各工事日報";
5215 5215
            this.btnConstruction0001.UseVisualStyleBackColor = true;
......
5218 5218
            // btnConstruction0002
5219 5219
            // 
5220 5220
            this.btnConstruction0002.Dock = System.Windows.Forms.DockStyle.Fill;
5221
            this.btnConstruction0002.Location = new System.Drawing.Point(492, 39);
5221
            this.btnConstruction0002.Location = new System.Drawing.Point(477, 39);
5222 5222
            this.btnConstruction0002.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
5223 5223
            this.btnConstruction0002.Name = "btnConstruction0002";
5224
            this.btnConstruction0002.Size = new System.Drawing.Size(172, 30);
5224
            this.btnConstruction0002.Size = new System.Drawing.Size(167, 30);
5225 5225
            this.btnConstruction0002.TabIndex = 15;
5226 5226
            this.btnConstruction0002.Text = "各工事打合わせ議事録";
5227 5227
            this.btnConstruction0002.UseVisualStyleBackColor = true;
......
5230 5230
            // btnConstruction0003
5231 5231
            // 
5232 5232
            this.btnConstruction0003.Dock = System.Windows.Forms.DockStyle.Fill;
5233
            this.btnConstruction0003.Location = new System.Drawing.Point(689, 39);
5233
            this.btnConstruction0003.Location = new System.Drawing.Point(668, 39);
5234 5234
            this.btnConstruction0003.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
5235 5235
            this.btnConstruction0003.Name = "btnConstruction0003";
5236
            this.btnConstruction0003.Size = new System.Drawing.Size(172, 30);
5236
            this.btnConstruction0003.Size = new System.Drawing.Size(167, 30);
5237 5237
            this.btnConstruction0003.TabIndex = 15;
5238 5238
            this.btnConstruction0003.Text = "各工事交通費・購入品入力";
5239 5239
            this.btnConstruction0003.UseVisualStyleBackColor = true;
......
5242 5242
            // btnConstruction0004
5243 5243
            // 
5244 5244
            this.btnConstruction0004.Dock = System.Windows.Forms.DockStyle.Fill;
5245
            this.btnConstruction0004.Location = new System.Drawing.Point(886, 39);
5245
            this.btnConstruction0004.Location = new System.Drawing.Point(859, 39);
5246 5246
            this.btnConstruction0004.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
5247 5247
            this.btnConstruction0004.Name = "btnConstruction0004";
5248
            this.btnConstruction0004.Size = new System.Drawing.Size(178, 30);
5248
            this.btnConstruction0004.Size = new System.Drawing.Size(171, 30);
5249 5249
            this.btnConstruction0004.TabIndex = 15;
5250 5250
            this.btnConstruction0004.Text = "出勤管理";
5251 5251
            this.btnConstruction0004.UseVisualStyleBackColor = true;
......
5254 5254
            // btnConstruction0100
5255 5255
            // 
5256 5256
            this.btnConstruction0100.Dock = System.Windows.Forms.DockStyle.Fill;
5257
            this.btnConstruction0100.Location = new System.Drawing.Point(98, 111);
5257
            this.btnConstruction0100.Location = new System.Drawing.Point(95, 111);
5258 5258
            this.btnConstruction0100.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
5259 5259
            this.btnConstruction0100.Name = "btnConstruction0100";
5260
            this.btnConstruction0100.Size = new System.Drawing.Size(172, 30);
5260
            this.btnConstruction0100.Size = new System.Drawing.Size(167, 30);
5261 5261
            this.btnConstruction0100.TabIndex = 15;
5262 5262
            this.btnConstruction0100.Text = "行動予定入力";
5263 5263
            this.btnConstruction0100.UseVisualStyleBackColor = true;
......
5266 5266
            // btnConstruction0101
5267 5267
            // 
5268 5268
            this.btnConstruction0101.Dock = System.Windows.Forms.DockStyle.Fill;
5269
            this.btnConstruction0101.Location = new System.Drawing.Point(295, 111);
5269
            this.btnConstruction0101.Location = new System.Drawing.Point(286, 111);
5270 5270
            this.btnConstruction0101.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
5271 5271
            this.btnConstruction0101.Name = "btnConstruction0101";
5272
            this.btnConstruction0101.Size = new System.Drawing.Size(172, 30);
5272
            this.btnConstruction0101.Size = new System.Drawing.Size(167, 30);
5273 5273
            this.btnConstruction0101.TabIndex = 15;
5274 5274
            this.btnConstruction0101.Text = "車両予約";
5275 5275
            this.btnConstruction0101.UseVisualStyleBackColor = true;
......
5284 5284
            this.lblConstr01.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
5285 5285
            this.lblConstr01.Location = new System.Drawing.Point(3, 108);
5286 5286
            this.lblConstr01.Name = "lblConstr01";
5287
            this.lblConstr01.Size = new System.Drawing.Size(88, 36);
5287
            this.lblConstr01.Size = new System.Drawing.Size(85, 36);
5288 5288
            this.lblConstr01.TabIndex = 15;
5289 5289
            this.lblConstr01.Text = "毎日";
5290 5290
            this.lblConstr01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......
5292 5292
            // btnConstruction0102
5293 5293
            // 
5294 5294
            this.btnConstruction0102.Dock = System.Windows.Forms.DockStyle.Fill;
5295
            this.btnConstruction0102.Location = new System.Drawing.Point(492, 111);
5295
            this.btnConstruction0102.Location = new System.Drawing.Point(477, 111);
5296 5296
            this.btnConstruction0102.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
5297 5297
            this.btnConstruction0102.Name = "btnConstruction0102";
5298
            this.btnConstruction0102.Size = new System.Drawing.Size(172, 30);
5298
            this.btnConstruction0102.Size = new System.Drawing.Size(167, 30);
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

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