プロジェクト

全般

プロフィール

リビジョン 65

山内7年以上前に追加

請求入力処理変更(不要ファイルも削除)

差分を表示:

branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputDefinitions.cs
1
using System;
2
using System.Collections.Generic;
3
using System.Linq;
4
using System.Text;
5
using System.Threading.Tasks;
6
using System.Windows.Forms;
7
using System.Collections;
8
using System.Drawing;
9

  
10
using ProcessManagement.DataModel;
11

  
12
namespace ProcessManagement.Forms.DataEntry
13
{
14
    public partial class FrmRequestInput : Form
15
    {
16
        #region 定数
17
        /// <summary>
18
        /// 列インデックス定義
19
        /// </summary>
20
        private enum ColumnIndex
21
        {
22
            SectionIndex,                   // セクションインデックス(非表示)
23
            RowKind,                        // 行種別(非表示)
24
            ConstructionCode,               // 工事番号(非表示)
25
            Headline,                       // 見出し
26
            ConstructionName,               // 工事名
27
            ConstructionPrice,              // 工事金額
28
            Label,                          // ラベル
29
            Total,                          // 合計
30
            RequestInfo,                    // 請求情報
31
            Amount,                         // 残り
32
        }
33

  
34
        /// <summary>
35
        /// 行セクションインデックス定義
36
        /// </summary>
37
        private enum RowSectionIndex
38
        {
39
            Header,                         // ヘッダ
40
            OriginalConstruction,           // 本工事
41
            ChildConstruction,              // 増減工事
42
            Total,                          // 合計
43
            DepositInfo,                     // 入金情報
44
        }
45

  
46
        /// <summary>
47
        /// 行種別定義
48
        /// </summary>
49
        private enum RowKind
50
        {
51
            RequestSheetCreateDate,         // 請求書作成日
52
            ApprobalStatus,                 // 承認状態
53
            RequestSheetPrice,              // 請求書金額
54
            BillPrice,                      // 請求金額
55
            TaxPrice,                       // 消費税
56
            AmountPrice,                    // (未入金分)
57
            NonTaxedPrice,                  // (税抜き)
58
            DepositDate,                    // 入金日
59
            DepositPrice,                   // 入金金額
60
            DifferencePrice,                // 差額
61
            DepositCheck,                   // 入金確認
62
        }
63

  
64
        /// <summary>
65
        /// 承認状態
66
        /// </summary>
67
        private enum RequestApprovalStatus
68
        {
69
            Approval,                       // 承認済み
70
            NotApproval,                    // 不承認
71
            Pending,                        // 保留
72
            NowApproval,                    // 承認中
73
            Petition,                       // 申請中
74
            NowInput,                       // 入力中
75
        }
76

  
77
        /// <summary>
78
        /// 請求書申請確認ダイアログタイトル
79
        /// </summary>
80
        private static readonly string s_RequestApprovalDialogTitle = "請求書申請";
81

  
82
        // 請求書申請確認ダイアログ 表示メッセージ
83
        private static readonly string s_MessageNotCompletionConstruction = "施工完了ではないため、請求書承認の申請はできません。";
84
        private static readonly string s_MessageNotCompletionRequest = "工事金額がすべて請求されていませんが、\n請求書承認を申請してよろしいですか?";
85
        private static readonly string s_MessageOverRequest = "請求金額が工事金額を超えていますが、\n請求書承認を申請してよろしいですか?";
86
        private static readonly string s_MessageComfirmRequest = "請求書承認を申請してよろしいですか?";
87

  
88
        #endregion
89

  
90
        #region Static変数
91
        /// <summary>
92
        /// 列タイトル定義
93
        /// </summary>
94
        private static Hashtable s_HtColumnTitles = new Hashtable()
95
        {
96
            { ColumnIndex.ConstructionName, "工事名" },
97
            { ColumnIndex.ConstructionPrice, "工事金額" },
98
            { ColumnIndex.Total, "合計" },
99
            { ColumnIndex.Amount, "残り" },
100
            {
101
                ColumnIndex.RequestInfo,
102
                new List<string>()
103
                {
104
                    "1回目",
105
                    "2回目",
106
                    "3回目",
107
                }
108
            }
109
        };
110

  
111
        /// <summary>
112
        /// セクション色の設定
113
        /// </summary>
114
        private static Hashtable s_HtRowColors = new Hashtable()
115
        {
116
            { RowSectionIndex.Header, Color.Yellow },
117
            { RowSectionIndex.Total,  Color.Moccasin },
118
            { RowSectionIndex.DepositInfo, Color.Yellow },
119
            {
120
                RowSectionIndex.ChildConstruction,
121
                new List<Color>()
122
                {
123
                    Color.LightBlue,
124
                    Color.White,
125
                }
126
            },
127
        };
128

  
129
        /// <summary>
130
        /// 行構成定義
131
        /// </summary>
132
        private static Dictionary<RowSectionIndex,List<RowKind>> s_HtRowSections = new Dictionary<RowSectionIndex, List<RowKind>>()
133
        {
134
            // ヘッダ
135
            {
136
                RowSectionIndex.Header,
137
                new List<RowKind>()
138
                {
139
                    RowKind.RequestSheetCreateDate,
140
                    RowKind.ApprobalStatus,
141
                    RowKind.RequestSheetPrice,
142
                }
143
            },
144
            // 本工事
145
            {
146
                RowSectionIndex.OriginalConstruction,
147
                new List<RowKind>()
148
                {
149
                    RowKind.BillPrice,
150
                    RowKind.TaxPrice,
151
                    RowKind.AmountPrice,
152
                }
153
            },
154
            // 増減工事
155
            {
156
                RowSectionIndex.ChildConstruction,
157
                new List<RowKind>()
158
                {
159
                    RowKind.BillPrice,
160
                    RowKind.TaxPrice,
161
                }
162
            },
163
            // 合計
164
            {
165
                RowSectionIndex.Total,
166
                new List<RowKind>()
167
                {
168
                    RowKind.BillPrice,
169
                    RowKind.NonTaxedPrice,
170
                    RowKind.TaxPrice,
171
                    RowKind.AmountPrice,
172
                }
173
            },
174
            // 入金情報
175
            {
176
                RowSectionIndex.DepositInfo,
177
                new List<RowKind>()
178
                {
179
                    RowKind.DepositDate,
180
                    RowKind.DepositPrice,
181
                    RowKind.DifferencePrice,
182
                    RowKind.DepositCheck,
183
                }
184
            }
185
        };
186

  
187
        /// <summary>
188
        /// 固定表示ラベル定義
189
        /// </summary>
190
        private static Dictionary<RowSectionIndex, Dictionary<RowKind, Dictionary<ColumnIndex, string>>> s_HtLabels = new Dictionary<RowSectionIndex, Dictionary<RowKind, Dictionary<ColumnIndex, string>>>()
191
        {
192
            // ヘッダ
193
            {
194
                RowSectionIndex.Header, new Dictionary<RowKind,Dictionary<ColumnIndex,string>>()
195
                {
196
                    // 請求書作成日行
197
                    {
198
                        RowKind.RequestSheetCreateDate, new Dictionary<ColumnIndex,string>()
199
                        {
200
                            { ColumnIndex.Label, "請求書作成" },
201
                        }
202
                    },
203
                    // 承認状態行
204
                    {
205
                        RowKind.ApprobalStatus, new Dictionary<ColumnIndex,string>()
206
                        {
207
                            { ColumnIndex.Label, "承認状態" },
208
                        }
209
                    },
210
                    // 請求書金額行
211
                    {
212
                        RowKind.RequestSheetPrice, new Dictionary<ColumnIndex,string>()
213
                        {
214
                            { ColumnIndex.Label, "請求書金額" },
215
                        }
216
                    },
217
                }
218
            },
219
            // 本工事
220
            {
221
                RowSectionIndex.OriginalConstruction, new Dictionary<RowKind,Dictionary<ColumnIndex,string>>()
222
                {
223
                    // 請求金額行
224
                    {
225
                        RowKind.BillPrice, new Dictionary<ColumnIndex,string>()
226
                        {
227
                            { ColumnIndex.Headline, "本工事" },
228
                            { ColumnIndex.Label, "請求金額" },
229
                        }
230
                    },
231
                    // 消費税行
232
                    {
233
                        RowKind.TaxPrice, new Dictionary<ColumnIndex,string>()
234
                        {
235
                            { ColumnIndex.Label, "消費税" },
236
                        }
237
                    },
238
                    // 未入金分行
239
                    {
240
                        RowKind.AmountPrice, new Dictionary<ColumnIndex,string>()
241
                        {
242
                            { ColumnIndex.Label, "(未入金分)" },
243
                        }
244
                    },
245
                }
246
            },
247
            // 増減工事
248
            {
249
                RowSectionIndex.ChildConstruction, new Dictionary<RowKind,Dictionary<ColumnIndex,string>>()
250
                {
251
                    // 請求金額行
252
                    {
253
                        RowKind.BillPrice, new Dictionary<ColumnIndex,string>()
254
                        {
255
                            { ColumnIndex.Headline, "増減工事" },
256
                            { ColumnIndex.Label, "請求金額" },
257
                        }
258
                    },
259
                    // 消費税行
260
                    {
261
                        RowKind.TaxPrice, new Dictionary<ColumnIndex,string>()
262
                        {
263
                            { ColumnIndex.Label, "消費税" },
264
                        }
265
                    },
266
                }
267
            },
268
            // 合計
269
            {
270
                RowSectionIndex.Total, new Dictionary<RowKind,Dictionary<ColumnIndex,string>>()
271
                {
272
                    // 請求金額行
273
                    {
274
                        RowKind.BillPrice, new Dictionary<ColumnIndex,string>()
275
                        {
276
                            { ColumnIndex.Headline, "合計" },
277
                            { ColumnIndex.Label, "請求金額" },
278
                        }
279
                    },
280
                    // 税抜き行
281
                    {
282
                        RowKind.NonTaxedPrice, new Dictionary<ColumnIndex,string>()
283
                        {
284
                            { ColumnIndex.Label, "(税抜き)" },
285
                        }
286
                    },
287
                    // 消費税行
288
                    {
289
                        RowKind.TaxPrice, new Dictionary<ColumnIndex,string>()
290
                        {
291
                            { ColumnIndex.Label, "(消費税)" },
292
                        }
293
                    },
294
                    // 未入金分行
295
                    {
296
                        RowKind.AmountPrice, new Dictionary<ColumnIndex,string>()
297
                        {
298
                            { ColumnIndex.Label, "(未入金分)" },
299
                        }
300
                    },
301
                }
302
            },
303
            // 入金情報
304
            {
305
                RowSectionIndex.DepositInfo, new Dictionary<RowKind,Dictionary<ColumnIndex,string>>()
306
                {
307
                    // 入金日行
308
                    {
309
                        RowKind.DepositDate, new Dictionary<ColumnIndex,string>()
310
                        {
311
                            { ColumnIndex.Label, "入金日" },
312
                        }
313
                    },
314
                    // 入金金額行
315
                    {
316
                        RowKind.DepositPrice, new Dictionary<ColumnIndex,string>()
317
                        {
318
                            { ColumnIndex.Label, "入金金額" },
319
                        }
320
                    },
321
                    // 差額行
322
                    {
323
                        RowKind.DifferencePrice, new Dictionary<ColumnIndex,string>()
324
                        {
325
                            { ColumnIndex.Label, "差額" },
326
                        }
327
                    },
328
                    // 入金確認行
329
                    {
330
                        RowKind.DepositCheck, new Dictionary<ColumnIndex,string>()
331
                        {
332
                            { ColumnIndex.Label, "入金確認" },
333
                        }
334
                    },
335
                }
336
            },
337
        };
338

  
339
        private static List<RowSectionIndex> lstAutoCalcSection = new List<RowSectionIndex>()
340
        {
341
            RowSectionIndex.OriginalConstruction,
342
            RowSectionIndex.ChildConstruction,
343
        };
344

  
345
        private static List<RowKind> lstAutoCalcKind = new List<RowKind>()
346
        {
347
            RowKind.BillPrice,
348
            RowKind.TaxPrice,
349
            RowKind.AmountPrice,
350
        };
351

  
352
        // 承認状態文字列
353
        private static Dictionary<RequestApprovalStatus, string> s_DictApprovalStatusString = new Dictionary<RequestApprovalStatus, string>()
354
        {
355
            { RequestApprovalStatus.Approval, "承認済み" },
356
            { RequestApprovalStatus.NotApproval, "不承認" },
357
            { RequestApprovalStatus.Pending, "保留" },
358
            { RequestApprovalStatus.NowApproval, "承認中" },
359
            { RequestApprovalStatus.Petition, "申請中" },
360
            { RequestApprovalStatus.NowInput, "入力中" },
361
        };
362

  
363
        #endregion
364

  
365
    }
366

  
367
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.Designer.cs
28 28
        /// </summary>
29 29
        private void InitializeComponent()
30 30
        {
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
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();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
47
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
48
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
49
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
50
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
51
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle148 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle149 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle150 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle151 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle152 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle153 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle154 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle155 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle156 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle157 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle158 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle159 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle160 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle161 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle162 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle163 = new System.Windows.Forms.DataGridViewCellStyle();
47
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle164 = new System.Windows.Forms.DataGridViewCellStyle();
48
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle165 = new System.Windows.Forms.DataGridViewCellStyle();
49
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle166 = new System.Windows.Forms.DataGridViewCellStyle();
50
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle167 = new System.Windows.Forms.DataGridViewCellStyle();
51
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle168 = new System.Windows.Forms.DataGridViewCellStyle();
52 52
            this.label3 = new System.Windows.Forms.Label();
53 53
            this.dgv1 = new System.Windows.Forms.DataGridView();
54 54
            this.col001 = new System.Windows.Forms.DataGridViewTextBoxColumn();
......
142 142
            this.col23,
143 143
            this.col098,
144 144
            this.col99});
145
            this.dgv1.Location = new System.Drawing.Point(12, 100);
145
            this.dgv1.Location = new System.Drawing.Point(12, 98);
146 146
            this.dgv1.Name = "dgv1";
147 147
            this.dgv1.RowHeadersWidth = 24;
148 148
            this.dgv1.RowTemplate.Height = 21;
149
            this.dgv1.Size = new System.Drawing.Size(1308, 439);
149
            this.dgv1.Size = new System.Drawing.Size(1308, 455);
150 150
            this.dgv1.TabIndex = 4;
151 151
            this.dgv1.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgv1_CellBeginEdit);
152 152
            this.dgv1.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dgv1_CellFormatting);
......
179 179
            // col004
180 180
            // 
181 181
            this.col004.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
182
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
183
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
184
            this.col004.DefaultCellStyle = dataGridViewCellStyle1;
182
            dataGridViewCellStyle148.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
183
            dataGridViewCellStyle148.BackColor = System.Drawing.SystemColors.Control;
184
            this.col004.DefaultCellStyle = dataGridViewCellStyle148;
185 185
            this.col004.Frozen = true;
186 186
            this.col004.HeaderText = "";
187 187
            this.col004.Name = "col004";
......
192 192
            // 
193 193
            // col005
194 194
            // 
195
            dataGridViewCellStyle2.BackColor = System.Drawing.Color.White;
196
            this.col005.DefaultCellStyle = dataGridViewCellStyle2;
195
            dataGridViewCellStyle149.BackColor = System.Drawing.Color.White;
196
            this.col005.DefaultCellStyle = dataGridViewCellStyle149;
197 197
            this.col005.Frozen = true;
198 198
            this.col005.HeaderText = "";
199 199
            this.col005.Name = "col005";
......
204 204
            // 
205 205
            // col006
206 206
            // 
207
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
208
            dataGridViewCellStyle3.BackColor = System.Drawing.Color.White;
209
            this.col006.DefaultCellStyle = dataGridViewCellStyle3;
207
            dataGridViewCellStyle150.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
208
            dataGridViewCellStyle150.BackColor = System.Drawing.Color.White;
209
            this.col006.DefaultCellStyle = dataGridViewCellStyle150;
210 210
            this.col006.Frozen = true;
211 211
            this.col006.HeaderText = "受注金額";
212 212
            this.col006.Name = "col006";
......
216 216
            // 
217 217
            // col007
218 218
            // 
219
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
220
            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
221
            this.col007.DefaultCellStyle = dataGridViewCellStyle4;
219
            dataGridViewCellStyle151.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
220
            dataGridViewCellStyle151.BackColor = System.Drawing.SystemColors.Control;
221
            this.col007.DefaultCellStyle = dataGridViewCellStyle151;
222 222
            this.col007.Frozen = true;
223 223
            this.col007.HeaderText = "";
224 224
            this.col007.Name = "col007";
......
228 228
            // 
229 229
            // col008
230 230
            // 
231
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
232
            this.col008.DefaultCellStyle = dataGridViewCellStyle5;
231
            dataGridViewCellStyle152.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
232
            this.col008.DefaultCellStyle = dataGridViewCellStyle152;
233 233
            this.col008.FillWeight = 120F;
234 234
            this.col008.Frozen = true;
235 235
            this.col008.HeaderText = "合計";
......
240 240
            // 
241 241
            // col009
242 242
            // 
243
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
244
            this.col009.DefaultCellStyle = dataGridViewCellStyle6;
243
            dataGridViewCellStyle153.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
244
            this.col009.DefaultCellStyle = dataGridViewCellStyle153;
245 245
            this.col009.HeaderText = "1回目";
246 246
            this.col009.Name = "col009";
247 247
            this.col009.ReadOnly = true;
......
250 250
            // 
251 251
            // col010
252 252
            // 
253
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
254
            this.col010.DefaultCellStyle = dataGridViewCellStyle7;
253
            dataGridViewCellStyle154.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
254
            this.col010.DefaultCellStyle = dataGridViewCellStyle154;
255 255
            this.col010.HeaderText = "2回目";
256 256
            this.col010.Name = "col010";
257 257
            this.col010.ReadOnly = true;
......
260 260
            // 
261 261
            // col011
262 262
            // 
263
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
264
            this.col011.DefaultCellStyle = dataGridViewCellStyle8;
263
            dataGridViewCellStyle155.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
264
            this.col011.DefaultCellStyle = dataGridViewCellStyle155;
265 265
            this.col011.HeaderText = "3回目";
266 266
            this.col011.Name = "col011";
267 267
            this.col011.ReadOnly = true;
......
270 270
            // 
271 271
            // col12
272 272
            // 
273
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
274
            this.col12.DefaultCellStyle = dataGridViewCellStyle9;
273
            dataGridViewCellStyle156.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
274
            this.col12.DefaultCellStyle = dataGridViewCellStyle156;
275 275
            this.col12.HeaderText = "4回目";
276 276
            this.col12.Name = "col12";
277 277
            this.col12.ReadOnly = true;
......
281 281
            // 
282 282
            // col13
283 283
            // 
284
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
285
            this.col13.DefaultCellStyle = dataGridViewCellStyle10;
284
            dataGridViewCellStyle157.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
285
            this.col13.DefaultCellStyle = dataGridViewCellStyle157;
286 286
            this.col13.HeaderText = "5回目";
287 287
            this.col13.Name = "col13";
288 288
            this.col13.ReadOnly = true;
......
292 292
            // 
293 293
            // col14
294 294
            // 
295
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
296
            this.col14.DefaultCellStyle = dataGridViewCellStyle11;
295
            dataGridViewCellStyle158.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
296
            this.col14.DefaultCellStyle = dataGridViewCellStyle158;
297 297
            this.col14.HeaderText = "6回目";
298 298
            this.col14.Name = "col14";
299 299
            this.col14.ReadOnly = true;
......
303 303
            // 
304 304
            // col15
305 305
            // 
306
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
307
            this.col15.DefaultCellStyle = dataGridViewCellStyle12;
306
            dataGridViewCellStyle159.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
307
            this.col15.DefaultCellStyle = dataGridViewCellStyle159;
308 308
            this.col15.HeaderText = "7回目";
309 309
            this.col15.Name = "col15";
310 310
            this.col15.ReadOnly = true;
......
314 314
            // 
315 315
            // col16
316 316
            // 
317
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
318
            this.col16.DefaultCellStyle = dataGridViewCellStyle13;
317
            dataGridViewCellStyle160.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
318
            this.col16.DefaultCellStyle = dataGridViewCellStyle160;
319 319
            this.col16.HeaderText = "8回目";
320 320
            this.col16.Name = "col16";
321 321
            this.col16.ReadOnly = true;
......
325 325
            // 
326 326
            // col17
327 327
            // 
328
            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
329
            this.col17.DefaultCellStyle = dataGridViewCellStyle14;
328
            dataGridViewCellStyle161.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
329
            this.col17.DefaultCellStyle = dataGridViewCellStyle161;
330 330
            this.col17.HeaderText = "9回目";
331 331
            this.col17.Name = "col17";
332 332
            this.col17.ReadOnly = true;
......
336 336
            // 
337 337
            // col18
338 338
            // 
339
            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
340
            this.col18.DefaultCellStyle = dataGridViewCellStyle15;
339
            dataGridViewCellStyle162.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
340
            this.col18.DefaultCellStyle = dataGridViewCellStyle162;
341 341
            this.col18.HeaderText = "10回目";
342 342
            this.col18.Name = "col18";
343 343
            this.col18.ReadOnly = true;
......
347 347
            // 
348 348
            // col19
349 349
            // 
350
            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
351
            this.col19.DefaultCellStyle = dataGridViewCellStyle16;
350
            dataGridViewCellStyle163.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
351
            this.col19.DefaultCellStyle = dataGridViewCellStyle163;
352 352
            this.col19.HeaderText = "11回目";
353 353
            this.col19.Name = "col19";
354 354
            this.col19.ReadOnly = true;
......
358 358
            // 
359 359
            // col20
360 360
            // 
361
            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
362
            this.col20.DefaultCellStyle = dataGridViewCellStyle17;
361
            dataGridViewCellStyle164.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
362
            this.col20.DefaultCellStyle = dataGridViewCellStyle164;
363 363
            this.col20.HeaderText = "12回目";
364 364
            this.col20.Name = "col20";
365 365
            this.col20.ReadOnly = true;
......
369 369
            // 
370 370
            // col21
371 371
            // 
372
            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
373
            this.col21.DefaultCellStyle = dataGridViewCellStyle18;
372
            dataGridViewCellStyle165.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
373
            this.col21.DefaultCellStyle = dataGridViewCellStyle165;
374 374
            this.col21.HeaderText = "13回目";
375 375
            this.col21.Name = "col21";
376 376
            this.col21.ReadOnly = true;
......
380 380
            // 
381 381
            // col22
382 382
            // 
383
            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
384
            this.col22.DefaultCellStyle = dataGridViewCellStyle19;
383
            dataGridViewCellStyle166.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
384
            this.col22.DefaultCellStyle = dataGridViewCellStyle166;
385 385
            this.col22.HeaderText = "14回目";
386 386
            this.col22.Name = "col22";
387 387
            this.col22.ReadOnly = true;
......
391 391
            // 
392 392
            // col23
393 393
            // 
394
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
395
            this.col23.DefaultCellStyle = dataGridViewCellStyle20;
394
            dataGridViewCellStyle167.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
395
            this.col23.DefaultCellStyle = dataGridViewCellStyle167;
396 396
            this.col23.HeaderText = "15回目";
397 397
            this.col23.Name = "col23";
398 398
            this.col23.ReadOnly = true;
......
402 402
            // 
403 403
            // col098
404 404
            // 
405
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
406
            this.col098.DefaultCellStyle = dataGridViewCellStyle21;
405
            dataGridViewCellStyle168.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
406
            this.col098.DefaultCellStyle = dataGridViewCellStyle168;
407 407
            this.col098.HeaderText = "残り";
408 408
            this.col098.Name = "col098";
409 409
            this.col098.ReadOnly = true;
......
438 438
            this.btnEntry.BackColor = System.Drawing.Color.GreenYellow;
439 439
            this.btnEntry.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
440 440
            this.btnEntry.ForeColor = System.Drawing.Color.Black;
441
            this.btnEntry.Location = new System.Drawing.Point(1072, 547);
441
            this.btnEntry.Location = new System.Drawing.Point(1071, 562);
442 442
            this.btnEntry.Name = "btnEntry";
443 443
            this.btnEntry.Size = new System.Drawing.Size(120, 28);
444 444
            this.btnEntry.TabIndex = 16;
......
451 451
            this.btnEnd.BackColor = System.Drawing.Color.Magenta;
452 452
            this.btnEnd.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
453 453
            this.btnEnd.ForeColor = System.Drawing.Color.Black;
454
            this.btnEnd.Location = new System.Drawing.Point(1198, 547);
454
            this.btnEnd.Location = new System.Drawing.Point(1197, 562);
455 455
            this.btnEnd.Name = "btnEnd";
456 456
            this.btnEnd.Size = new System.Drawing.Size(120, 28);
457 457
            this.btnEnd.TabIndex = 15;
......
464 464
            this.btnAdd.BackColor = System.Drawing.Color.Orange;
465 465
            this.btnAdd.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
466 466
            this.btnAdd.ForeColor = System.Drawing.Color.Black;
467
            this.btnAdd.Location = new System.Drawing.Point(158, 547);
467
            this.btnAdd.Location = new System.Drawing.Point(158, 564);
468 468
            this.btnAdd.Name = "btnAdd";
469 469
            this.btnAdd.Size = new System.Drawing.Size(120, 28);
470 470
            this.btnAdd.TabIndex = 17;
......
477 477
            this.btnOtherProc.BackColor = System.Drawing.Color.Lime;
478 478
            this.btnOtherProc.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
479 479
            this.btnOtherProc.ForeColor = System.Drawing.Color.Black;
480
            this.btnOtherProc.Location = new System.Drawing.Point(12, 547);
480
            this.btnOtherProc.Location = new System.Drawing.Point(12, 564);
481 481
            this.btnOtherProc.Name = "btnOtherProc";
482 482
            this.btnOtherProc.Size = new System.Drawing.Size(140, 28);
483 483
            this.btnOtherProc.TabIndex = 18;
......
546 546
            // 
547 547
            this.btnApproval.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
548 548
            this.btnApproval.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
549
            this.btnApproval.Location = new System.Drawing.Point(3, 5);
549
            this.btnApproval.Location = new System.Drawing.Point(2, 6);
550 550
            this.btnApproval.Name = "btnApproval";
551 551
            this.btnApproval.Size = new System.Drawing.Size(130, 27);
552 552
            this.btnApproval.TabIndex = 25;
......
636 636
            // 
637 637
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
638 638
            this.BackColor = System.Drawing.Color.Black;
639
            this.ClientSize = new System.Drawing.Size(1328, 588);
639
            this.ClientSize = new System.Drawing.Size(1328, 603);
640 640
            this.Controls.Add(this.pnlNormal);
641 641
            this.Controls.Add(this.button1);
642 642
            this.Controls.Add(this.txtOrderer);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.resx
192 192
  <metadata name="col99.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
193 193
    <value>True</value>
194 194
  </metadata>
195
  <metadata name="col001.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
196
    <value>True</value>
197
  </metadata>
198
  <metadata name="col002.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
199
    <value>True</value>
200
  </metadata>
201
  <metadata name="col003.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
202
    <value>True</value>
203
  </metadata>
204
  <metadata name="col004.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
205
    <value>True</value>
206
  </metadata>
207
  <metadata name="col005.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
208
    <value>True</value>
209
  </metadata>
210
  <metadata name="col006.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
211
    <value>True</value>
212
  </metadata>
213
  <metadata name="col007.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
214
    <value>True</value>
215
  </metadata>
216
  <metadata name="col008.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
217
    <value>True</value>
218
  </metadata>
219
  <metadata name="col009.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
220
    <value>True</value>
221
  </metadata>
222
  <metadata name="col010.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
223
    <value>True</value>
224
  </metadata>
225
  <metadata name="col011.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
226
    <value>True</value>
227
  </metadata>
228
  <metadata name="col12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
229
    <value>True</value>
230
  </metadata>
231
  <metadata name="col13.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
232
    <value>True</value>
233
  </metadata>
234
  <metadata name="col14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
235
    <value>True</value>
236
  </metadata>
237
  <metadata name="col15.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
238
    <value>True</value>
239
  </metadata>
240
  <metadata name="col16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
241
    <value>True</value>
242
  </metadata>
243
  <metadata name="col17.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
244
    <value>True</value>
245
  </metadata>
246
  <metadata name="col18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
247
    <value>True</value>
248
  </metadata>
249
  <metadata name="col19.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
250
    <value>True</value>
251
  </metadata>
252
  <metadata name="col20.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
253
    <value>True</value>
254
  </metadata>
255
  <metadata name="col21.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
256
    <value>True</value>
257
  </metadata>
258
  <metadata name="col22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
259
    <value>True</value>
260
  </metadata>
261
  <metadata name="col23.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
262
    <value>True</value>
263
  </metadata>
264
  <metadata name="col098.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
265
    <value>True</value>
266
  </metadata>
267
  <metadata name="col99.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
268
    <value>True</value>
269
  </metadata>
195 270
</root>
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs
1556 1556
                }
1557 1557

  
1558 1558
                dgv1[tcol, trow].Value = m_lstDepositDate[i].ToString("yyyy/MM/dd");
1559
                dgv1[tcol, trow].Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
1559 1560

  
1560 1561
                nDepositAmount += DepDetail.DepositAmount;
1561 1562
                nGapAmount += (DepDetail.DepositAmount - ReqHead.RequestTotalAmount);
......
1566 1567
                if (m_lstDepositState[i] == (int)DepositState.Done)
1567 1568
                {
1568 1569
                    dgv1[tcol, trow + 3].Value = "確認済";
1570
                    dgv1[tcol, trow + 3].Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
1569 1571
                }
1570 1572
            }
1571 1573

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
671 671
                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == iSeqNo)
672 672
                                                               .Sum(y => CommonMotions.cnvInt(y.Cells[(int)DispColumn.SomuSeikyu].Value));
673 673

  
674
                
675 674
                int iKosoku = 0, iKanamono = 0, iSanpai = 0;////?????????U?p
676 675
                string KojiTanto = "", KojiTantoCode="";
677 676

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.Designer.cs
452 452
            this.DepositDate.Name = "DepositDate";
453 453
            this.DepositDate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
454 454
            this.DepositDate.Width = 120;
455
            this.DepositDate.Visible = false;
456 455
            // 
457 456
            // DepositAmountCash
458 457
            // 
......
489 488
            this.ConstructionName.HeaderText = "現場名";
490 489
            this.ConstructionName.Name = "ConstructionName";
491 490
            this.ConstructionName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
492
            this.ConstructionName.Width = 400;
491
            this.ConstructionName.Width = 270;
493 492
            // 
494 493
            // ConstructionName_Raw
495 494
            // 
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.cs
671 671
        /// <param name="e"></param>
672 672
        private List<KeyValuePair<int, String>> getPersonList(int iDepartmentCode)
673 673
        {
674
            var listDepartment = new List<KeyValuePair<int, String>>();
674
            var listPerson = new List<KeyValuePair<int, String>>();
675 675

  
676
            listDepartment.Add(new KeyValuePair<int, String>(0, "すべて"));
676
            listPerson.Add(new KeyValuePair<int, String>(0, "すべて"));
677 677

  
678 678
            var listResultSQL = new ArrayList();
679 679
            listResultSQL = getPersonListQuery(iDepartmentCode);
680 680

  
681 681
            foreach (object[] result in listResultSQL)
682 682
            {
683
                int iPersonCode = CommonMotions.cnvInt(result[0]);
684
                String strPersonName = CommonMotions.cnvString(result[1]);
685
                listDepartment.Add(new KeyValuePair<int, String>(iPersonCode, strPersonName));
683
                int iResultPersonCode = CommonMotions.cnvInt(result[0]);
684
                String strResultPersonName = CommonMotions.cnvString(result[1]);
685
                listPerson.Add(new KeyValuePair<int, String>(iResultPersonCode, strResultPersonName));
686 686
            }
687 687

  
688
            return listDepartment;
688
            return listPerson;
689 689

  
690 690
        }
691 691

  
......
713 713
                /////////////////////////////////////////////////////////////////////////////
714 714
                if (!iDepartmentCode.Equals(0))
715 715
                {
716
                    sql.AppendFormat("AND PERIM.DepartmentCode = {0} ", iDepartmentCode);             // 担当者マスタ.担当者コード = 画面.担当者コード(隠し項目)
716
                    sql.AppendFormat("AND PERIM.DepartmentCode = {0} ", iDepartmentCode);             // 担当者マスタ.担当者コード = 画面.部署コード(隠し項目)
717 717
                }
718 718
                /////////////////////////////////////////////////////////////////////////////
719 719
                // 検索条件(動的)END
......
1835 1835
                sql.Append("AND DEP.TARGETDATE = DTL.TARGETDATE ");
1836 1836
                sql.Append("AND DTL.SEQNO = 1 ");
1837 1837

  
1838
                //sql.Append("AND DTL.APPROVALENDFLG = 1 ");
1839
                // ↑後で増やす(承認完了フラグ)
1838
                sql.Append("AND DTL.APPROVALENDFLG = 1 ");
1840 1839

  
1841 1840
                /////////////////////////////////////////////////////////////////////////////
1842 1841
                // 検索条件(動的)START
......
3145 3144
        /// <returns></returns>
3146 3145
        private void comboBox2_SelectedIndexChanged(object sender, EventArgs e)
3147 3146
        {
3148
            // 一覧再取得
3149
            DisplayData();
3150 3147

  
3148

  
3151 3149
            // 担当者再取得
3152
            this.listPerson = getPersonList(CommonMotions.cnvInt(comboBox2.SelectedValue));
3153

  
3154 3150
            comboBox3.SelectedIndexChanged -= new System.EventHandler(this.comboBox3_SelectedIndexChanged);
3155 3151

  
3156
            comboBox3.DataSource = listPerson;
3152
            comboBox3.DataSource = getPersonList(CommonMotions.cnvInt(comboBox2.SelectedValue));
3157 3153
            comboBox3.SelectedIndex = 0;
3158 3154

  
3159 3155
            comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged);
3160 3156

  
3157
            // 一覧再取得
3158
            DisplayData();
3161 3159

  
3160

  
3162 3161
        }
3163 3162

  
3164 3163
        /// <summary>
......
3168 3167
        /// <returns></returns>
3169 3168
        private void comboBox3_SelectedIndexChanged(object sender, EventArgs e)
3170 3169
        {
3171
            // 一覧再取得
3172
            DisplayData();
3173 3170

  
3174 3171
            // 部署再取得
3175 3172
            this.listDepartment = getDepartmentList(CommonMotions.cnvInt(comboBox3.SelectedValue));
3176 3173

  
3177 3174
            comboBox2.SelectedIndexChanged -= new System.EventHandler(this.comboBox2_SelectedIndexChanged);
3178 3175

  
3179
            comboBox2.DataSource = listDepartment;
3180
            comboBox2.SelectedIndex = 0;
3176
            comboBox2.SelectedValue = listDepartment[1].Key;
3181 3177

  
3182 3178
            comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged);
3183 3179

  
3180
            // 一覧再取得
3181
            DisplayData();
3182

  
3184 3183
        }
3185 3184

  
3186 3185

  
branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj
1514 1514
      <DependentUpon>Settings.settings</DependentUpon>
1515 1515
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
1516 1516
    </Compile>
1517
    <None Include="RequestSheet.xlsx">
1518
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
1519
    </None>
1517 1520
  </ItemGroup>
1518 1521
  <ItemGroup>
1519 1522
    <Folder Include="Forms\SystemFrm\" />

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