プロジェクト

全般

プロフィール

リビジョン 402

堀内6年以上前に追加

工事基本情報:請求確認日セットのバグ修正
詳細台帳:請求確認日セットロジックを追加(デバッグロジック)
請求書印刷:請求書印刷画面の表示のバグ修正

差分を表示:

trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
851 851
        //?|14:???U?[?u?|15:???U?[?u?|16:????C?H???|17:Hit'sV?H??
852 852
        #endregion
853 853

  
854
        #region ??????e?L?X?g?{?b?N?X???O???X?g
855
        /// <summary>
856
        /// ??????e?L?X?g?{?b?N?X???O???X?g
857
        /// </summary>
858
        private static string[] UndecidedArray = {
859
                                                    "txtInput25",           // ??????????z
860
                                                    "txtInput28",           // ??????????z
861
                                                    "txtInput02",           // ?????o??
862
                                                    "txtInput03",           // ???
863
                                                    "txtInput38",           // ?J?n?\???
864
                                                    "txtInput34",           // ?????\???
865
                                                    "txtInput35",           // ?{?H?J?n??
866
                                                    "txtInput04",           // ?{?H??????
867
                                                    "txtInput27",           // ?????o????
868
                                                    "txtInput06",           // ????L??????
869
                                                    "txtInput29",           // ?_??H???J?n
870
                                                    "txtInput30",           // ?_??H??????
871
                                                    "txtInput12",           // ?H???J?n??
872
                                                    "txtInput13",           // ?H???I????
873
                                                    "txtInput36",           // ?????????J?n??
874
                                                    "textBoxEX6",           // ??????
875
                                                    "textBoxEX1",		    // ?????
876
                                                    "textBoxEX2",		    // ????
877
                                                    "textBoxEX4",		    // ?_??H???J?n?i???????j
878
                                                    "textBoxEX5",		    // ?_??H???????i???????j
879
                                                    "textBoxEX3",		    // ?{?H?????J?n??
880
                                                    //"textBoxEX8",		    // ???????X????
881
                                                    //"textBoxEX9",		    // ???????????
882
                                                    //"textBoxEX10",		// ??????????m?F??
883
                                                    //"textBoxEX6",		    // ???????X??/??n????
884
                                                    "textBoxEX7",           // ?????\???
885
                                                    "textBoxEX8",           // ???????s??
886
                                                    "textBoxEX9",           // ??????????????
887
                                                 };
888
        #endregion
889

  
890 854
        #region ?H?????z???????^?C?g???t?H?[?}?b?g
891 855
        /// <summary>
892 856
        /// ?H?????z???????^?C?g???t?H?[?}?b?g
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
87 87
            {
88 88
                // ?e?L?X?g?{?b?N?X????b?Z?[?W??\??????
89 89
                bool showFocus = false;
90
                CommonMotions.SendMessage(txtInput25.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ??????????z
91
                CommonMotions.SendMessage(txtInput28.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ??????????z
92 90
                CommonMotions.SendMessage(txtInput02.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?????o??
93 91
                CommonMotions.SendMessage(txtInput03.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ???
94
                CommonMotions.SendMessage(txtInput38.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?J?n?\???
95
                CommonMotions.SendMessage(txtInput34.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?????\???
96
                CommonMotions.SendMessage(txtInput35.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?{?H?J?n??
97 92
                CommonMotions.SendMessage(txtInput04.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?{?H??????
93
                CommonMotions.SendMessage(txtInput06.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ????L??????
94
                CommonMotions.SendMessage(txtInput12.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?H???J?n??
95
                CommonMotions.SendMessage(txtInput13.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?H???I????
96
                CommonMotions.SendMessage(txtInput25.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ??????????z
98 97
                CommonMotions.SendMessage(txtInput27.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?????o????
99
                CommonMotions.SendMessage(txtInput06.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ????L??????
98
                CommonMotions.SendMessage(txtInput28.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ??????????z
100 99
                CommonMotions.SendMessage(txtInput29.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?_??H???J?n
101 100
                CommonMotions.SendMessage(txtInput30.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?_??H??????
102
                CommonMotions.SendMessage(txtInput12.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?H???J?n??
103
                CommonMotions.SendMessage(txtInput13.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?H???I????
101
                CommonMotions.SendMessage(txtInput34.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?????\???
102
                CommonMotions.SendMessage(txtInput35.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?{?H?J?n??
104 103
                CommonMotions.SendMessage(txtInput36.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?????????J?n??
105
                CommonMotions.SendMessage(textBoxEX6.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ??????
104
                CommonMotions.SendMessage(txtInput38.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?J?n?\???
106 105
                CommonMotions.SendMessage(textBoxEX1.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?????
107 106
                CommonMotions.SendMessage(textBoxEX2.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ????
107
                CommonMotions.SendMessage(textBoxEX3.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?{?H?????J?n??
108 108
                CommonMotions.SendMessage(textBoxEX4.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?_??H???J?n?i???????j
109 109
                CommonMotions.SendMessage(textBoxEX5.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?_??H???????i???????j
110
                CommonMotions.SendMessage(textBoxEX3.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?{?H?????J?n??
111
                //CommonMotions.SendMessage(textBoxEX8.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ???????X????
112
                //CommonMotions.SendMessage(textBoxEX9.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ???????????
113
                //CommonMotions.SendMessage(textBoxEX10.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ??????????m?F??
114
                //CommonMotions.SendMessage(textBoxEX6.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ???????X??/??n????
110
                CommonMotions.SendMessage(textBoxEX6.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);			// ?????m?F??
115 111
                CommonMotions.SendMessage(textBoxEX7.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);          // ?????\???
116 112
                CommonMotions.SendMessage(textBoxEX8.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);          // ???????s??
117 113
                CommonMotions.SendMessage(textBoxEX9.Handle, 5377, new IntPtr(showFocus ? 1 : 0), CommonDefine.s_UndecidedString);          // ??????????????
118 114

  
119 115
                // Enable?????\??????????????i????R???g???[???????????E???????s???????j
120
                txtInput25.Text = CommonDefine.s_UndecidedString;			// ??????????z
121
                txtInput28.Text = CommonDefine.s_UndecidedString;			// ??????????z
122 116
                txtInput02.Text = CommonDefine.s_UndecidedString;			// ?????o??
123 117
                txtInput03.Text = CommonDefine.s_UndecidedString;			// ???
124
                txtInput38.Text = CommonDefine.s_UndecidedString;			// ?J?n?\???
125
                txtInput34.Text = CommonDefine.s_UndecidedString;			// ?????\???
126
                txtInput35.Text = CommonDefine.s_UndecidedString;			// ?{?H?J?n??
127 118
                txtInput04.Text = CommonDefine.s_UndecidedString;			// ?{?H??????
119
                txtInput06.Text = CommonDefine.s_UndecidedString;			// ????L??????
120
                txtInput12.Text = CommonDefine.s_UndecidedString;			// ?H???J?n??
121
                txtInput13.Text = CommonDefine.s_UndecidedString;			// ?H???I????
122
                txtInput25.Text = CommonDefine.s_UndecidedString;			// ??????????z
128 123
                txtInput27.Text = CommonDefine.s_UndecidedString;			// ?????o????
129
                txtInput06.Text = CommonDefine.s_UndecidedString;			// ????L??????
124
                txtInput28.Text = CommonDefine.s_UndecidedString;			// ??????????z
130 125
                txtInput29.Text = CommonDefine.s_UndecidedString;			// ?_??H???J?n
131 126
                txtInput30.Text = CommonDefine.s_UndecidedString;			// ?_??H??????
132
                txtInput12.Text = CommonDefine.s_UndecidedString;			// ?H???J?n??
133
                txtInput13.Text = CommonDefine.s_UndecidedString;			// ?H???I????
127
                txtInput34.Text = CommonDefine.s_UndecidedString;			// ?????\???
128
                txtInput35.Text = CommonDefine.s_UndecidedString;			// ?{?H?J?n??
134 129
                txtInput36.Text = CommonDefine.s_UndecidedString;			// ?????????J?n??
135
                textBoxEX6.Text = CommonDefine.s_UndecidedString;			// ??????
130
                txtInput38.Text = CommonDefine.s_UndecidedString;			// ?J?n?\???
136 131
                textBoxEX1.Text = CommonDefine.s_UndecidedString;		    // ?????
137 132
                textBoxEX2.Text = CommonDefine.s_UndecidedString;		    // ????
133
                textBoxEX3.Text = CommonDefine.s_UndecidedString;		    // ?{?H?????J?n??
138 134
                textBoxEX4.Text = CommonDefine.s_UndecidedString;		    // ?_??H???J?n?i???????j
139 135
                textBoxEX5.Text = CommonDefine.s_UndecidedString;		    // ?_??H???????i???????j
140
                textBoxEX3.Text = CommonDefine.s_UndecidedString;		    // ?{?H?????J?n??
141
                //textBoxEX8.Text = CommonDefine.s_UndecidedString;		    // ???????X????
142
                //textBoxEX9.Text = CommonDefine.s_UndecidedString;		    // ???????????
143
                //textBoxEX10.Text = CommonDefine.s_UndecidedString;		// ??????????m?F??
144
                //textBoxEX6.Text = CommonDefine.s_UndecidedString;		    // ???????X??/??n????
136
                textBoxEX6.Text = CommonDefine.s_UndecidedString;			// ?????m?F??
145 137
                textBoxEX7.Text = CommonDefine.s_UndecidedString;           // ?????\???
146 138
                textBoxEX8.Text = CommonDefine.s_UndecidedString;           // ???????s??
147 139
                textBoxEX9.Text = CommonDefine.s_UndecidedString;           // ??????????????
......
5424 5416
            {
5425 5417
                // ????
5426 5418
                int iStatusCount = GetStatusForCheckBox();
5427

  
5419
                DateTime wrkDate = DateTime.Today;
5428 5420
                switch (iStatusCount)
5429 5421
                {
5430 5422
                    case (int)CommonDefine.StatNumArray.Status0:        // 0, ??????
......
5433 5425
                        m_DspCtrl[(int)DspCnt.EstimatesSubmitDeadline].Text = DateTime.Now.AddDays(s_EstimatesSubmitDeadline).ToShortDateString();   // ?????o????????
5434 5426
                        break;
5435 5427
                    case (int)CommonDefine.StatNumArray.Status1:        // 1, ?????o
5436
                        if (m_DspCtrl[(int)DspCnt.EstimatesSubmittedDate].Text.Length != 0) break;
5428
                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.EstimatesSubmittedDate].Text).Date;
5429
                        if (wrkDate != DateTime.MinValue.Date) break;
5437 5430
                        m_DspCtrl[(int)DspCnt.EstimatesSubmittedDate].Text = DateTime.Now.ToShortDateString();       // ?????o??????
5438 5431
                        m_DspCtrl[(int)DspCnt.EstimatesExpirationDate].Text = DateTime.Now.AddMonths(CommonDefine.s_EstimatesExpirationDeadline).ToShortDateString(); // ????L??????????
5439 5432
                        break;
5440 5433
                    case (int)CommonDefine.StatNumArray.Status2:        // 2, ????C?H??
5441
                        if (m_DspCtrl[(int)DspCnt.ConstructionStartingDate].Text.Length != 0) break;
5434
                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.ConstructionStartingDate].Text).Date;
5435
                        if (wrkDate != DateTime.MinValue.Date) break;
5442 5436
                        m_DspCtrl[(int)DspCnt.ConstructionStartingDate].Text = DateTime.Now.ToShortDateString();     // ?{?H?J?n??????
5443 5437
                        break;
5444 5438
                    case (int)CommonDefine.StatNumArray.Status3:        // 3, ?? ?? ??
5445
                        if (m_DspCtrl[(int)DspCnt.ProvisionalOrderDate].Text.Length != 0) break;
5439
                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.ProvisionalOrderDate].Text).Date;
5440
                        if (wrkDate != DateTime.MinValue.Date) break;
5446 5441
                        m_DspCtrl[(int)DspCnt.ProvisionalOrderDate].Text = DateTime.Now.ToShortDateString();         // ?????????
5447 5442
                        break;
5448 5443
                    case (int)CommonDefine.StatNumArray.Status4:        // 4, ??@?@??
5449
                        if (m_DspCtrl[(int)DspCnt.OrderDate].Text.Length != 0) break;
5444
                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.OrderDate].Text).Date;
5445
                        if (wrkDate != DateTime.MinValue.Date) break;
5450 5446
                        m_DspCtrl[(int)DspCnt.OrderDate].Text = DateTime.Now.ToShortDateString();                    // ???????
5451 5447
                        break;
5452 5448
                    case (int)CommonDefine.StatNumArray.Status5:        // 5, ???????p
5453
                        if (m_DspCtrl[(int)DspCnt.TransferConstructionDate].Text.Length != 0) break;
5449
                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.TransferConstructionDate].Text).Date;
5450
                        if (wrkDate != DateTime.MinValue.Date) break;
5454 5451
                        m_DspCtrl[(int)DspCnt.TransferConstructionDate].Text = DateTime.Now.ToShortDateString();     // ???????p??????
5455 5452
                        break;
5456 5453
                    case (int)CommonDefine.StatNumArray.Status6:        // 6, ?{?H????
5457
                        if (m_DspCtrl[(int)DspCnt.PreparationStartDate].Text.Length != 0) break;
5454
                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.PreparationStartDate].Text).Date;
5455
                        if (wrkDate != DateTime.MinValue.Date) break;
5458 5456
                        m_DspCtrl[(int)DspCnt.PreparationStartDate].Text = DateTime.Now.ToShortDateString();         // ?{?H?????J?n??????
5459 5457
                        break;
5460 5458
                    case (int)CommonDefine.StatNumArray.Status7:        // 7, ?{?H?J?n
5461
                        if (m_DspCtrl[(int)DspCnt.ConstructionStartingDate].Text.Length != 0) break;
5459
                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.ConstructionStartingDate].Text).Date;
5460
                        if (wrkDate != DateTime.MinValue.Date) break;
5462 5461
                        m_DspCtrl[(int)DspCnt.ConstructionStartingDate].Text = DateTime.Now.ToShortDateString();     // ?{?H?J?n??????
5463 5462
                        break;
5464 5463
                    case (int)CommonDefine.StatNumArray.Status8:        // 8, ?{?H????
5465
                        if (m_DspCtrl[(int)DspCnt.ConstructionCompletionDate].Text.Length != 0) break;
5464
                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.ConstructionCompletionDate].Text).Date;
5465
                        if (wrkDate != DateTime.MinValue.Date) break;
5466 5466
                        m_DspCtrl[(int)DspCnt.ConstructionCompletionDate].Text = DateTime.Now.ToShortDateString();   // ?{?H??????????
5467 5467
                        break;
5468 5468
                    case (int)CommonDefine.StatNumArray.Status9:        // 9, ????????
5469
                        if (m_DspCtrl[(int)DspCnt.BillingStartDate].Text.Length != 0) break;
5469
                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.BillingStartDate].Text).Date;
5470
                        if (wrkDate != DateTime.MinValue.Date) break;
5470 5471
                        m_DspCtrl[(int)DspCnt.BillingStartDate].Text = DateTime.Now.ToShortDateString();             // ?????????J?n??????
5471 5472
                        break;
5472 5473
                    case (int)CommonDefine.StatNumArray.Status10:       // 10, ?????m?F
5473
                        if (m_DspCtrl[(int)DspCnt.BillingComplateDate].Text.Length != 0) break;
5474
                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.BillingComplateDate].Text).Date;
5475
                        if (wrkDate != DateTime.MinValue.Date) break;
5474 5476
                        m_DspCtrl[(int)DspCnt.BillingComplateDate].Text = DateTime.Now.ToShortDateString();          // ?????m?F??????
5475 5477
                        break;
5476 5478
                    case (int)CommonDefine.StatNumArray.Status11:       // 11, ?? ?? ??
5477
                        if (m_DspCtrl[(int)DspCnt.NonOrderDate].Text.Length != 0) break;
5479
                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.NonOrderDate].Text).Date;
5480
                        if (wrkDate != DateTime.MinValue.Date) break;
5478 5481
                        m_DspCtrl[(int)DspCnt.NonOrderDate].Text = DateTime.Now.ToShortDateString();                 // ????????
5479 5482
                        break;
5480 5483
                    case (int)CommonDefine.StatNumArray.Status12:       // 12, ?????????m?F
......
5482 5485
                    case (int)CommonDefine.StatNumArray.Status13:       // 13, ?S????????m?F????
5483 5486
                        break;
5484 5487
                    case (int)CommonDefine.StatNumArray.Status16:       // 16, ????C?H??
5485
                        if (m_DspCtrl[(int)DspCnt.ConstructionStartingDate].Text.Length != 0) break;
5488
                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.ConstructionStartingDate].Text).Date;
5489
                        if (wrkDate != DateTime.MinValue.Date) break;
5486 5490
                        m_DspCtrl[(int)DspCnt.ConstructionStartingDate].Text = DateTime.Now.ToShortDateString();     // ?{?H?J?n??????
5487 5491
                        break;
5488 5492
                    case (int)CommonDefine.StatNumArray.Status17:       // 17, Hit'sV?H??
5489
                        if (m_DspCtrl[(int)DspCnt.ConstructionStartingDate].Text.Length != 0) break;
5493
                        wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.ConstructionStartingDate].Text).Date;
5494
                        if (wrkDate != DateTime.MinValue.Date) break;
5490 5495
                        m_DspCtrl[(int)DspCnt.ConstructionStartingDate].Text = DateTime.Now.ToShortDateString();     // ?{?H?J?n??????
5491 5496
                        break;
5492 5497
                }
......
6012 6017
        {
6013 6018
            try
6014 6019
            {
6020
                DateTime wrkDate = DateTime.Today;
6021

  
6015 6022
                // ????????????????????????????????????????b?N????
6016
                TextBox txtRevComp = (TextBox)m_DspCtrl[(int)DspCnt.RevCompleteDate];
6017
                if (txtRevComp.Text.Length < 1 || txtRevComp.Text.Equals(CommonDefine.s_UndecidedString))
6023
                wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.RevCompleteDate].Text).Date;
6024
                if (wrkDate == DateTime.MinValue.Date)
6018 6025
                {
6019 6026
                    // ??????????????
6020
                    txtRevComp.Enabled = true;
6027
                    m_DspCtrl[(int)DspCnt.RevCompleteDate].Enabled = true;
6021 6028
                    // ?????????????R?????g
6022 6029
                    m_DspCtrl[(int)DspCnt.RevCompleteComment].Enabled = true;
6023 6030
                }
......
6027 6034
                    btnDataEntry.Visible = true;
6028 6035
                }
6029 6036
                // ?????m?F????????????????????????????b?N????
6030
                TextBox txtBillComp = (TextBox)m_DspCtrl[(int)DspCnt.BillingComplateDate];
6031
                if (txtBillComp.Text.Length < 1 || txtBillComp.Text.Equals(CommonDefine.s_UndecidedString))
6037
                wrkDate = CommonMotions.cnvUndecidedStringToDate(m_DspCtrl[(int)DspCnt.BillingComplateDate].Text).Date;
6038
                if (wrkDate == DateTime.MinValue.Date)
6032 6039
                {
6033 6040
                    // ?????m?F??
6034
                    txtBillComp.Enabled = true;
6041
                    m_DspCtrl[(int)DspCnt.BillingComplateDate].Enabled = true;
6035 6042
                    // ?????R?????g
6036 6043
                    m_DspCtrl[(int)DspCnt.BillingComment].Enabled = true;
6037 6044
                }
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.cs
1622 1622
        /// <param name="e"></param>
1623 1623
        private void button2_Click(object sender, EventArgs e)
1624 1624
        {
1625
            TestDataTest();
1625
            SetBaseCompDate();
1626
            //TestDataTest();
1626 1627
            //RecalcalculationPersonnelExpenses();
1627 1628
            //ReCalculation();
1628 1629
        }
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs
87 87
            this.btnLineDel = new System.Windows.Forms.Button();
88 88
            this.btnLineAdd = new System.Windows.Forms.Button();
89 89
            this.panel2 = new System.Windows.Forms.Panel();
90
            this.lblCellTotal = new System.Windows.Forms.Label();
91
            this.btnDispDown = new System.Windows.Forms.Button();
92
            this.btnDispUp = new System.Windows.Forms.Button();
93
            this.btnOtherProc = new System.Windows.Forms.Button();
94
            this.button1 = new System.Windows.Forms.Button();
95
            this.button2 = new System.Windows.Forms.Button();
96
            this.btnSelect = new System.Windows.Forms.Button();
97
            this.btnCreate = new System.Windows.Forms.Button();
90 98
            this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
91 99
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
92 100
            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
......
117 125
            this.Column25 = new System.Windows.Forms.DataGridViewTextBoxColumn();
118 126
            this.Column26 = new System.Windows.Forms.DataGridViewTextBoxColumn();
119 127
            this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn();
120
            this.lblCellTotal = new System.Windows.Forms.Label();
121
            this.btnDispDown = new System.Windows.Forms.Button();
122
            this.btnDispUp = new System.Windows.Forms.Button();
123
            this.btnOtherProc = new System.Windows.Forms.Button();
124
            this.button1 = new System.Windows.Forms.Button();
125
            this.button2 = new System.Windows.Forms.Button();
126
            this.btnSelect = new System.Windows.Forms.Button();
127
            this.btnCreate = new System.Windows.Forms.Button();
128 128
            this.grpExample1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
129 129
            this.lblReqSumType03 = new System.Windows.Forms.Label();
130 130
            this.lblReqSumType01 = new System.Windows.Forms.Label();
......
794 794
            this.panel2.Size = new System.Drawing.Size(1290, 450);
795 795
            this.panel2.TabIndex = 36;
796 796
            // 
797
            // lblCellTotal
798
            // 
799
            this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
800
            this.lblCellTotal.AutoSize = true;
801
            this.lblCellTotal.BackColor = System.Drawing.Color.WhiteSmoke;
802
            this.lblCellTotal.Font = new System.Drawing.Font("MS P明朝", 9.75F, System.Drawing.FontStyle.Bold);
803
            this.lblCellTotal.ForeColor = System.Drawing.Color.Black;
804
            this.lblCellTotal.Location = new System.Drawing.Point(100, 430);
805
            this.lblCellTotal.Name = "lblCellTotal";
806
            this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
807
            this.lblCellTotal.TabIndex = 36;
808
            // 
809
            // btnDispDown
810
            // 
811
            this.btnDispDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
812
            this.btnDispDown.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
813
            this.btnDispDown.Location = new System.Drawing.Point(1300, 418);
814
            this.btnDispDown.Name = "btnDispDown";
815
            this.btnDispDown.Size = new System.Drawing.Size(40, 40);
816
            this.btnDispDown.TabIndex = 42;
817
            this.btnDispDown.TabStop = false;
818
            this.btnDispDown.Text = "▼";
819
            this.btnDispDown.UseVisualStyleBackColor = true;
820
            this.btnDispDown.Visible = false;
821
            this.btnDispDown.Click += new System.EventHandler(this.btnDispDown_Click);
822
            // 
823
            // btnDispUp
824
            // 
825
            this.btnDispUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
826
            this.btnDispUp.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
827
            this.btnDispUp.Location = new System.Drawing.Point(1300, 354);
828
            this.btnDispUp.Name = "btnDispUp";
829
            this.btnDispUp.Size = new System.Drawing.Size(40, 40);
830
            this.btnDispUp.TabIndex = 41;
831
            this.btnDispUp.TabStop = false;
832
            this.btnDispUp.Text = "▲";
833
            this.btnDispUp.UseVisualStyleBackColor = true;
834
            this.btnDispUp.Visible = false;
835
            this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click);
836
            // 
837
            // btnOtherProc
838
            // 
839
            this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
840
            this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
841
            this.btnOtherProc.Location = new System.Drawing.Point(7, 656);
842
            this.btnOtherProc.Name = "btnOtherProc";
843
            this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
844
            this.btnOtherProc.TabIndex = 95;
845
            this.btnOtherProc.TabStop = false;
846
            this.btnOtherProc.Text = "他の画面へ";
847
            this.btnOtherProc.UseVisualStyleBackColor = false;
848
            this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click);
849
            // 
850
            // button1
851
            // 
852
            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
853
            this.button1.Location = new System.Drawing.Point(1300, 540);
854
            this.button1.Name = "button1";
855
            this.button1.Size = new System.Drawing.Size(37, 35);
856
            this.button1.TabIndex = 100;
857
            this.button1.Text = "○";
858
            this.button1.UseVisualStyleBackColor = true;
859
            this.button1.Visible = false;
860
            this.button1.Click += new System.EventHandler(this.button1_Click);
861
            // 
862
            // button2
863
            // 
864
            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
865
            this.button2.Location = new System.Drawing.Point(1300, 581);
866
            this.button2.Name = "button2";
867
            this.button2.Size = new System.Drawing.Size(37, 35);
868
            this.button2.TabIndex = 101;
869
            this.button2.Text = "1";
870
            this.button2.UseVisualStyleBackColor = true;
871
            this.button2.Visible = false;
872
            this.button2.Click += new System.EventHandler(this.button2_Click);
873
            // 
874
            // btnSelect
875
            // 
876
            this.btnSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
877
            this.btnSelect.BackColor = System.Drawing.Color.Green;
878
            this.btnSelect.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
879
            this.btnSelect.ForeColor = System.Drawing.Color.White;
880
            this.btnSelect.Location = new System.Drawing.Point(546, 657);
881
            this.btnSelect.Name = "btnSelect";
882
            this.btnSelect.Size = new System.Drawing.Size(120, 30);
883
            this.btnSelect.TabIndex = 102;
884
            this.btnSelect.Text = "選 択";
885
            this.btnSelect.UseVisualStyleBackColor = false;
886
            this.btnSelect.Visible = false;
887
            this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
888
            // 
889
            // btnCreate
890
            // 
891
            this.btnCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
892
            this.btnCreate.BackColor = System.Drawing.Color.White;
893
            this.btnCreate.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
894
            this.btnCreate.ForeColor = System.Drawing.Color.Green;
895
            this.btnCreate.Location = new System.Drawing.Point(420, 657);
896
            this.btnCreate.Name = "btnCreate";
897
            this.btnCreate.Size = new System.Drawing.Size(120, 30);
898
            this.btnCreate.TabIndex = 103;
899
            this.btnCreate.Text = "新 規";
900
            this.btnCreate.UseVisualStyleBackColor = false;
901
            this.btnCreate.Visible = false;
902
            this.btnCreate.Click += new System.EventHandler(this.btnCreate_Click);
903
            // 
797 904
            // dgvAllDisplay
798 905
            // 
799 906
            this.dgvAllDisplay.AllowUserToAddRows = false;
......
1136 1243
            this.Column28.ReadOnly = true;
1137 1244
            this.Column28.Visible = false;
1138 1245
            // 
1139
            // lblCellTotal
1140
            // 
1141
            this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
1142
            this.lblCellTotal.AutoSize = true;
1143
            this.lblCellTotal.BackColor = System.Drawing.Color.WhiteSmoke;
1144
            this.lblCellTotal.Font = new System.Drawing.Font("MS P明朝", 9.75F, System.Drawing.FontStyle.Bold);
1145
            this.lblCellTotal.ForeColor = System.Drawing.Color.Black;
1146
            this.lblCellTotal.Location = new System.Drawing.Point(100, 430);
1147
            this.lblCellTotal.Name = "lblCellTotal";
1148
            this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
1149
            this.lblCellTotal.TabIndex = 36;
1150
            // 
1151
            // btnDispDown
1152
            // 
1153
            this.btnDispDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
1154
            this.btnDispDown.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1155
            this.btnDispDown.Location = new System.Drawing.Point(1300, 418);
1156
            this.btnDispDown.Name = "btnDispDown";
1157
            this.btnDispDown.Size = new System.Drawing.Size(40, 40);
1158
            this.btnDispDown.TabIndex = 42;
1159
            this.btnDispDown.TabStop = false;
1160
            this.btnDispDown.Text = "▼";
1161
            this.btnDispDown.UseVisualStyleBackColor = true;
1162
            this.btnDispDown.Visible = false;
1163
            this.btnDispDown.Click += new System.EventHandler(this.btnDispDown_Click);
1164
            // 
1165
            // btnDispUp
1166
            // 
1167
            this.btnDispUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
1168
            this.btnDispUp.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1169
            this.btnDispUp.Location = new System.Drawing.Point(1300, 354);
1170
            this.btnDispUp.Name = "btnDispUp";
1171
            this.btnDispUp.Size = new System.Drawing.Size(40, 40);
1172
            this.btnDispUp.TabIndex = 41;
1173
            this.btnDispUp.TabStop = false;
1174
            this.btnDispUp.Text = "▲";
1175
            this.btnDispUp.UseVisualStyleBackColor = true;
1176
            this.btnDispUp.Visible = false;
1177
            this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click);
1178
            // 
1179
            // btnOtherProc
1180
            // 
1181
            this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
1182
            this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
1183
            this.btnOtherProc.Location = new System.Drawing.Point(7, 656);
1184
            this.btnOtherProc.Name = "btnOtherProc";
1185
            this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
1186
            this.btnOtherProc.TabIndex = 95;
1187
            this.btnOtherProc.TabStop = false;
1188
            this.btnOtherProc.Text = "他の画面へ";
1189
            this.btnOtherProc.UseVisualStyleBackColor = false;
1190
            this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click);
1191
            // 
1192
            // button1
1193
            // 
1194
            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
1195
            this.button1.Location = new System.Drawing.Point(1300, 540);
1196
            this.button1.Name = "button1";
1197
            this.button1.Size = new System.Drawing.Size(37, 35);
1198
            this.button1.TabIndex = 100;
1199
            this.button1.Text = "○";
1200
            this.button1.UseVisualStyleBackColor = true;
1201
            this.button1.Visible = false;
1202
            this.button1.Click += new System.EventHandler(this.button1_Click);
1203
            // 
1204
            // button2
1205
            // 
1206
            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
1207
            this.button2.Location = new System.Drawing.Point(1300, 581);
1208
            this.button2.Name = "button2";
1209
            this.button2.Size = new System.Drawing.Size(37, 35);
1210
            this.button2.TabIndex = 101;
1211
            this.button2.Text = "1";
1212
            this.button2.UseVisualStyleBackColor = true;
1213
            this.button2.Visible = false;
1214
            this.button2.Click += new System.EventHandler(this.button2_Click);
1215
            // 
1216
            // btnSelect
1217
            // 
1218
            this.btnSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
1219
            this.btnSelect.BackColor = System.Drawing.Color.Green;
1220
            this.btnSelect.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1221
            this.btnSelect.ForeColor = System.Drawing.Color.White;
1222
            this.btnSelect.Location = new System.Drawing.Point(546, 657);
1223
            this.btnSelect.Name = "btnSelect";
1224
            this.btnSelect.Size = new System.Drawing.Size(120, 30);
1225
            this.btnSelect.TabIndex = 102;
1226
            this.btnSelect.Text = "選 択";
1227
            this.btnSelect.UseVisualStyleBackColor = false;
1228
            this.btnSelect.Visible = false;
1229
            this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
1230
            // 
1231
            // btnCreate
1232
            // 
1233
            this.btnCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
1234
            this.btnCreate.BackColor = System.Drawing.Color.White;
1235
            this.btnCreate.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1236
            this.btnCreate.ForeColor = System.Drawing.Color.Green;
1237
            this.btnCreate.Location = new System.Drawing.Point(420, 657);
1238
            this.btnCreate.Name = "btnCreate";
1239
            this.btnCreate.Size = new System.Drawing.Size(120, 30);
1240
            this.btnCreate.TabIndex = 103;
1241
            this.btnCreate.Text = "新 規";
1242
            this.btnCreate.UseVisualStyleBackColor = false;
1243
            this.btnCreate.Visible = false;
1244
            this.btnCreate.Click += new System.EventHandler(this.btnCreate_Click);
1245
            // 
1246 1246
            // grpExample1
1247 1247
            // 
1248 1248
            this.grpExample1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
9819 9819
        }
9820 9820
        #endregion
9821 9821

  
9822
        #region 工事基本情報請求完了日セット
9823
        /// <summary>
9824
        /// 工事基本情報請求完了日セット
9825
        /// </summary>
9826
        private void SetBaseCompDate()
9827
        {
9828
            IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
9829
            try
9830
            {
9831
                StringBuilder strSQL = new StringBuilder();
9832
                strSQL.Append("Select A.ConstructionCode, DATE(A.ChangeDate) From constructionprogressdate As A");
9833
                strSQL.Append(" Where A.ConstructionCode IN(");
9834
                strSQL.Append("                            Select B.ConstructionCode From constructionbaseinfo As B");
9835
                strSQL.Append("                            Where B.ConstructionStatusFlg = 10");
9836
                strSQL.Append("                            And DATE (B.BillingDate) = DATE('0001/01/01'))");
9837
                strSQL.Append(" And A.ConstructionStatusFlg = 10");
9838
                strSQL.Append(" Order By A.ConstructionCode");
9839

  
9840
                ArrayList arList = new ArrayList();
9841
                BaseDB.ExecuteReader(strSQL.ToString(), ref arList);
9842

  
9843
                BaseDB.connect(); BaseDB.beginTran();
9844

  
9845
                int cnt = 0;
9846
                foreach (object[] objRec in arList)
9847
                {
9848
                    int nCode = CommonMotions.cnvInt(objRec[0]);
9849
                    DateTime wrkDT = CommonMotions.cnvDate(objRec[1]);
9850

  
9851
                    if(!BaseDB.UpdateFeild(nCode,(int)IOConstructionBaseInfo.TableColumn.BillingDate,wrkDT,false))
9852
                    {
9853
                        BaseDB.rollback();
9854
                        MessageBox.Show("更新エラー");
9855
                        break;
9856
                    }
9857
                    cnt++;
9858
                }
9859

  
9860
                MessageBox.Show(string.Format("終了件数:{0}", cnt));
9861
                BaseDB.commit();
9862
            }
9863
            catch (Exception ex)
9864
            {
9865
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
9866
            }
9867
            finally
9868
            {
9869
                BaseDB.close(); BaseDB = null;
9870
            }
9871
        }
9872
        #endregion
9822 9873
        // ---------- ※.データコンバートロジック↑↑
9823 9874
        #endregion
9824 9875

  
9825 9876
        #region ※.テストロジック↓↓
9826 9877
        // ---------- ※.テストロジック↓↓
9827

  
9878
        #region 台帳日付セットテスト
9828 9879
        private void TestDataTest()
9829 9880
        {
9830 9881
            IOConstructionLedger LedgerDB = new IOConstructionLedger();
......
9859 9910
                ExecDB.close(); ExecDB = null;
9860 9911
            }
9861 9912
        }
9913
        #endregion
9862 9914
        // ---------- ※.テストロジック↑↑
9863 9915
        #endregion
9864 9916
    }
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrint/FrmRequestPrintSelAux.cs
127 127
            try
128 128
            {
129 129
                StringBuilder sql = new StringBuilder();
130
                sql.Append(" As InvData");
130
                sql.Append("SELECT InvData.* FROM InvoiceData As InvData");
131
                sql.Append("                      Inner Join RequestHead As ReqHead");
132
                sql.Append("                             On ReqHead.InvoiceNo = InvData.InvoiceNo");
133
                sql.Append("                      Inner Join constructionbaseinfo As Base");
134
                sql.Append("                             On Base.ConstructionCode = ReqHead.REQCONSTRUCTIONCODE");
135
                sql.AppendFormat("                       And Base.BillingSplitFlg = {0}", m_ExecuteSubFlg);
131 136
                sql.AppendFormat(" WHERE InvData.OrderersDivision = {0}", m_nOrderersDivision);
132 137
                sql.AppendFormat(" AND InvData.OrderersCode = {0} ", m_nOrderersCode);
133 138
                sql.AppendFormat(" AND InvData.RequestMonth = {0} ", m_nRequestMonth);
134 139
                sql.AppendFormat(" AND InvData.COMPLETEFLG > {0}", (int)InvoiceData.CompleteFlgDef.Deleted);
135
                sql.Append("       AND EXISTS( SELECT * FROM RequestHead ReqHead WHERE ReqHead.InvoiceNo = InvData.InvoiceNo )");
136 140
                sql.Append(" ORDER BY InvData.CretateDate Asc, InvData.SeqNo Asc");
137 141

  
142
                ArrayList arData = new ArrayList();
138 143
                List<InvoiceData> InvoiceList = new List<InvoiceData>();
139 144
                // SQL実行
140
                if (!ioInvData.SelectAction(sql.ToString(), ref InvoiceList)) return;
145
                if (!ioInvData.ExecuteReader(sql.ToString(), ref arData)) return;
141 146

  
142 147
                // データセット
148
                foreach (object[] objwrk in arData)
149
                {
150
                    InvoiceData work = new InvoiceData();
151
                    ioInvData.Reader2Struct(objwrk, ref work);
152
                    InvoiceList.Add(work);
153
                }
154

  
155
                // データセット
143 156
                m_dicInvData.Clear();
144 157
                foreach(InvoiceData work in InvoiceList)
145 158
                {
......
171 184
            {
172 185
                StringBuilder sql = new StringBuilder();
173 186
                sql.Append("Select A.* From RequestHead As A");
187
                sql.Append("           Inner Join constructionbaseinfo As Base");
188
                sql.Append("                  On Base.ConstructionCode = A.REQCONSTRUCTIONCODE");
189
                sql.AppendFormat("            And Base.BillingSplitFlg = {0}", m_ExecuteSubFlg);
174 190
                sql.Append("           Inner Join processapproval As B");
175 191
                sql.Append("                  On B.ConstructionCode = A.REQCONSTRUCTIONCODE");
176 192
                sql.AppendFormat("            And B.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.OrderRequestApproval);
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrintList/FrmReqPrintList.designer.cs
42 42
            this.label1 = new System.Windows.Forms.Label();
43 43
            this.btnDataUpDate = new System.Windows.Forms.Button();
44 44
            this.lblCellTotal = new System.Windows.Forms.Label();
45
            this.lblProcessTitil = new System.Windows.Forms.Label();
45 46
            this.groupBox1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
46 47
            this.label3 = new System.Windows.Forms.Label();
47 48
            this.label4 = new System.Windows.Forms.Label();
......
62 63
            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
63 64
            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
64 65
            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
65
            this.lblProcessTitil = new System.Windows.Forms.Label();
66 66
            this.groupBox1.SuspendLayout();
67 67
            ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit();
68 68
            ((System.ComponentModel.ISupportInitialize)(this.dgvEntry)).BeginInit();
......
121 121
            this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
122 122
            this.lblCellTotal.TabIndex = 31;
123 123
            // 
124
            // lblProcessTitil
125
            // 
126
            this.lblProcessTitil.BackColor = System.Drawing.Color.White;
127
            this.lblProcessTitil.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
128
            this.lblProcessTitil.Location = new System.Drawing.Point(10, 10);
129
            this.lblProcessTitil.Name = "lblProcessTitil";
130
            this.lblProcessTitil.Size = new System.Drawing.Size(300, 20);
131
            this.lblProcessTitil.TabIndex = 32;
132
            this.lblProcessTitil.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
133
            // 
124 134
            // groupBox1
125 135
            // 
126 136
            this.groupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
......
219 229
            this.cmbReqMonth.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
220 230
            this.cmbReqMonth.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
221 231
            this.cmbReqMonth.FormattingEnabled = true;
232
            this.cmbReqMonth.ImeMode = System.Windows.Forms.ImeMode.Off;
222 233
            this.cmbReqMonth.Location = new System.Drawing.Point(422, 20);
234
            this.cmbReqMonth.MaxDropDownItems = 12;
223 235
            this.cmbReqMonth.Name = "cmbReqMonth";
224 236
            this.cmbReqMonth.Size = new System.Drawing.Size(150, 23);
225 237
            this.cmbReqMonth.TabIndex = 1;
......
399 411
            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
400 412
            this.Column9.Visible = false;
401 413
            // 
402
            // lblProcessTitil
403
            // 
404
            this.lblProcessTitil.BackColor = System.Drawing.Color.White;
405
            this.lblProcessTitil.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
406
            this.lblProcessTitil.Location = new System.Drawing.Point(10, 10);
407
            this.lblProcessTitil.Name = "lblProcessTitil";
408
            this.lblProcessTitil.Size = new System.Drawing.Size(300, 20);
409
            this.lblProcessTitil.TabIndex = 32;
410
            this.lblProcessTitil.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
411
            // 
412 414
            // FrmReqPrintList
413 415
            // 
414 416
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestPrintList/FrmReqPrintListAuxiliary.cs
364 364
                strSQL.Append(" requesthead as ReqHead");
365 365
                strSQL.Append(" Inner Join constructionbaseinfo as Base");
366 366
                strSQL.Append("    On Base.ConstructionCode = ReqHead.REQCONSTRUCTIONCODE");
367
                strSQL.AppendFormat(" AND Base.BILLINGSPLITFLG = {0}", m_ExecuteSubFlg);
368

  
367 369
                strSQL.Append(" Inner Join orderersmaster as OrderM");
368 370
                strSQL.Append("    On OrderM.OrderCotegory = ReqHead.ORDERERSDIVISION");
369 371
                strSQL.Append("    And OrderM.OrderersCode = ReqHead.ORDERERSCODE");
372

  
370 373
                strSQL.Append(" Left Join DivisionMaster as DivMas");
371 374
                strSQL.AppendFormat(" On DivMas.DivisionCode = {0}", (int)DivisionMaster.DivisionMasterCodeDef.OrderDivision);
372 375
                strSQL.Append("       And DivMas.NameCode = ReqHead.ORDERERSCODE");
373 376
                strSQL.Append(" Where");
377

  
374 378
                if (CommonMotions.BasePeriodYear())
375 379
                    strSQL.AppendFormat(" Base.ConstructionPeriod = {0}", numUDConstPro.Value);
376 380
                else
377 381
                    strSQL.AppendFormat(" Base.ConstructionYear = {0}", numUDConstPro.Value);
378 382

  
379
                strSQL.AppendFormat(" AND Base.BILLINGSPLITFLG = {0}", m_ExecuteSubFlg);
380

  
381 383
                if (cmbReqMonth.Text.Length > 0)
382 384
                {
383 385
                    strSQL.AppendFormat(" And ReqHead.REQUESTMONTH = {0}", cmbReqMonth.SelectedValue);
384 386
                }
385 387
                if (cmbOrderer.Text.Length > 0)
386 388
                {
387
                    strSQL.AppendFormat(" And  ReqHead.ORDERERSDIVISION = {0}", cmbOrderer.SelectedValue);
389
                    strSQL.AppendFormat(" And ReqHead.ORDERERSDIVISION = {0}", cmbOrderer.SelectedValue);
388 390
                }
389 391

  
390 392
                strSQL.Append(" Group by");

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