プロジェクト

全般

プロフィール

リビジョン 269

堀内7年以上前に追加

一覧検索選択ラジオボタン位置変更
データコピー画面画面説明文字追加
協力会社系画面検索条件SQLバグ修正

差分を表示:

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

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.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 dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
44 44
            this.btnDataEntry = new System.Windows.Forms.Button();
45 45
            this.btnEnd = new System.Windows.Forms.Button();
46 46
            this.label1 = new System.Windows.Forms.Label();
......
143 143
            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
144 144
            this.label3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
145 145
            this.label3.ForeColor = System.Drawing.Color.Black;
146
            this.label3.Location = new System.Drawing.Point(747, 19);
146
            this.label3.Location = new System.Drawing.Point(739, 19);
147 147
            this.label3.Name = "label3";
148 148
            this.label3.Size = new System.Drawing.Size(120, 25);
149 149
            this.label3.TabIndex = 4;
......
233 233
            this.cmbConstructionPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
234 234
            this.cmbConstructionPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
235 235
            this.cmbConstructionPerson.FormattingEnabled = true;
236
            this.cmbConstructionPerson.Location = new System.Drawing.Point(875, 20);
236
            this.cmbConstructionPerson.Location = new System.Drawing.Point(867, 20);
237 237
            this.cmbConstructionPerson.Name = "cmbConstructionPerson";
238 238
            this.cmbConstructionPerson.Size = new System.Drawing.Size(200, 23);
239 239
            this.cmbConstructionPerson.TabIndex = 2;
......
315 315
            this.dgvMaster.AllowUserToDeleteRows = false;
316 316
            this.dgvMaster.AllowUserToResizeColumns = false;
317 317
            this.dgvMaster.AllowUserToResizeRows = false;
318
            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
319
            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
318
            dataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
319
            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle27;
320 320
            this.dgvMaster.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
321 321
            | System.Windows.Forms.AnchorStyles.Left) 
322 322
            | System.Windows.Forms.AnchorStyles.Right)));
323 323
            this.dgvMaster.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
324 324
            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
325
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
326
            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
327
            dataGridViewCellStyle2.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
328
            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
329
            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
330
            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
331
            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
332
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
325
            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
326
            dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control;
327
            dataGridViewCellStyle28.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
328
            dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText;
329
            dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight;
330
            dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
331
            dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
332
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle28;
333 333
            this.dgvMaster.ColumnHeadersHeight = 24;
334 334
            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
335 335
            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
......
344 344
            this.Column3,
345 345
            this.Column2,
346 346
            this.Column11});
347
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
348
            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
349
            dataGridViewCellStyle13.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
350
            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
351
            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
352
            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
353
            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
354
            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle13;
347
            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
348
            dataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Window;
349
            dataGridViewCellStyle39.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
350
            dataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.ControlText;
351
            dataGridViewCellStyle39.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
352
            dataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
353
            dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
354
            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle39;
355 355
            this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
356 356
            this.dgvMaster.Location = new System.Drawing.Point(10, 103);
357 357
            this.dgvMaster.MultiSelect = false;
......
367 367
            // 
368 368
            // Column1
369 369
            // 
370
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
371
            this.Column1.DefaultCellStyle = dataGridViewCellStyle3;
370
            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
371
            this.Column1.DefaultCellStyle = dataGridViewCellStyle29;
372 372
            this.Column1.Frozen = true;
373 373
            this.Column1.HeaderText = "№";
374 374
            this.Column1.Name = "Column1";
......
379 379
            // 
380 380
            // Column9
381 381
            // 
382
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
383
            this.Column9.DefaultCellStyle = dataGridViewCellStyle4;
382
            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
383
            this.Column9.DefaultCellStyle = dataGridViewCellStyle30;
384 384
            this.Column9.Frozen = true;
385 385
            this.Column9.HeaderText = "営業部署";
386 386
            this.Column9.Name = "Column9";
......
390 390
            // 
391 391
            // Column5
392 392
            // 
393
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
394
            this.Column5.DefaultCellStyle = dataGridViewCellStyle5;
393
            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
394
            this.Column5.DefaultCellStyle = dataGridViewCellStyle31;
395 395
            this.Column5.Frozen = true;
396 396
            this.Column5.HeaderText = "営業担当者";
397 397
            this.Column5.Name = "Column5";
......
402 402
            // 
403 403
            // Column10
404 404
            // 
405
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
406
            this.Column10.DefaultCellStyle = dataGridViewCellStyle6;
405
            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
406
            this.Column10.DefaultCellStyle = dataGridViewCellStyle32;
407 407
            this.Column10.Frozen = true;
408 408
            this.Column10.HeaderText = "工事部署";
409 409
            this.Column10.Name = "Column10";
......
413 413
            // 
414 414
            // Column6
415 415
            // 
416
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
417
            this.Column6.DefaultCellStyle = dataGridViewCellStyle7;
416
            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
417
            this.Column6.DefaultCellStyle = dataGridViewCellStyle33;
418 418
            this.Column6.Frozen = true;
419 419
            this.Column6.HeaderText = "工事担当者";
420 420
            this.Column6.Name = "Column6";
......
425 425
            // 
426 426
            // Column4
427 427
            // 
428
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
429
            this.Column4.DefaultCellStyle = dataGridViewCellStyle8;
428
            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
429
            this.Column4.DefaultCellStyle = dataGridViewCellStyle34;
430 430
            this.Column4.Frozen = true;
431 431
            this.Column4.HeaderText = "工 事 名 称";
432 432
            this.Column4.Name = "Column4";
......
437 437
            // 
438 438
            // Column7
439 439
            // 
440
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
441
            this.Column7.DefaultCellStyle = dataGridViewCellStyle9;
440
            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
441
            this.Column7.DefaultCellStyle = dataGridViewCellStyle35;
442 442
            this.Column7.Frozen = true;
443 443
            this.Column7.HeaderText = "施工状態";
444 444
            this.Column7.Name = "Column7";
......
449 449
            // 
450 450
            // Column8
451 451
            // 
452
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
453
            this.Column8.DefaultCellStyle = dataGridViewCellStyle10;
452
            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
453
            this.Column8.DefaultCellStyle = dataGridViewCellStyle36;
454 454
            this.Column8.Frozen = true;
455 455
            this.Column8.HeaderText = "印刷";
456 456
            this.Column8.Name = "Column8";
......
461 461
            // 
462 462
            // Column3
463 463
            // 
464
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
465
            this.Column3.DefaultCellStyle = dataGridViewCellStyle11;
464
            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
465
            this.Column3.DefaultCellStyle = dataGridViewCellStyle37;
466 466
            this.Column3.Frozen = true;
467 467
            this.Column3.HeaderText = "営業期";
468 468
            this.Column3.Name = "Column3";
......
474 474
            // 
475 475
            // Column2
476 476
            // 
477
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
478
            this.Column2.DefaultCellStyle = dataGridViewCellStyle12;
477
            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
478
            this.Column2.DefaultCellStyle = dataGridViewCellStyle38;
479 479
            this.Column2.Frozen = true;
480 480
            this.Column2.HeaderText = "工事コード";
481 481
            this.Column2.Name = "Column2";
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
1676 1676
                    int TotalPoint = dgv.ColumnCount + (int)ColPayTotal.Totals;
1677 1677
                    RowData[TotalPoint] = "0";
1678 1678
                    // 実績欄位置取得
1679
                    int ResultPoint = dgv.ColumnCount + (int)ColPayTotal.Results;
1680
                    RowData[ResultPoint] = DetailRec.ExecutionAmount.ToString("#,0");
1681

  
1679
                    if (DetailRec.ExecutionAmount > 0)
1680
                    {
1681
                        int ResultPoint = dgv.ColumnCount + (int)ColPayTotal.Results;
1682
                        RowData[ResultPoint] = DetailRec.ExecutionAmount.ToString("#,0");
1683
                    }
1682 1684
                    // 行セット
1683 1685
                    CreateDataRow(RowData);
1684 1686
                }
......
2907 2909

  
2908 2910
                    // 支払可能額表示
2909 2911
                    int ExecValue = 0;
2910
                    if (GroupNo != (int)DataGroup.Expenses)
2912
                    // 実行金額がマイナスの場合は表示しない 2017/09/04
2913
                    if (GroupNo != (int)DataGroup.Expenses && DetailRec.ExecutionAmount > 0)
2911 2914
                    {   // 経費以外の時のみ支払可能額を計算する
2912 2915
                        ExecValue = (int)(DetailRec.ExecutionAmount - TotalValue);
2913 2916
                    }
......
4984 4987
            try
4985 4988
            {
4986 4989
                DataGridView dgv = dgvAllDisplay;
4990
                
4987 4991
                int ResultCols = dgv.ColumnCount + (int)ColPayTotal.Results;
4988 4992
                int OverpaymentCols = dgv.ColumnCount + (int)ColPayTotal.Overpayments;
4989 4993

  
4990 4994
                DataGridViewRow CurRow = dgv.Rows[RowCnt];
4991 4995

  
4996
                // 実行金額がマイナスの場合は計算しない 2017/09/04
4997
                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ExecPrice].Value) < 0) return;
4998
                
4992 4999
                int ResultValue = CommonMotions.cnvInt(CurRow.Cells[ResultCols].Value);
4993 5000
                // 支払可能額がマイナスになったら文字を赤にする
4994 5001
                if (ResultValue < 0)
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetList.designer.cs
28 28
        /// </summary>
29 29
        private void InitializeComponent()
30 30
        {
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
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 39
            this.btnDataSelect = new System.Windows.Forms.Button();
40 40
            this.btnEnd = new System.Windows.Forms.Button();
41 41
            this.label1 = new System.Windows.Forms.Label();
......
129 129
            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
130 130
            this.label3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
131 131
            this.label3.ForeColor = System.Drawing.Color.Black;
132
            this.label3.Location = new System.Drawing.Point(747, 19);
132
            this.label3.Location = new System.Drawing.Point(739, 19);
133 133
            this.label3.Name = "label3";
134 134
            this.label3.Size = new System.Drawing.Size(120, 25);
135 135
            this.label3.TabIndex = 48;
......
222 222
            this.cmbConstructionPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
223 223
            this.cmbConstructionPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
224 224
            this.cmbConstructionPerson.FormattingEnabled = true;
225
            this.cmbConstructionPerson.Location = new System.Drawing.Point(875, 20);
225
            this.cmbConstructionPerson.Location = new System.Drawing.Point(867, 20);
226 226
            this.cmbConstructionPerson.Name = "cmbConstructionPerson";
227 227
            this.cmbConstructionPerson.Size = new System.Drawing.Size(200, 23);
228 228
            this.cmbConstructionPerson.TabIndex = 47;
......
273 273
            this.dgvMaster.AllowUserToDeleteRows = false;
274 274
            this.dgvMaster.AllowUserToResizeColumns = false;
275 275
            this.dgvMaster.AllowUserToResizeRows = false;
276
            dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
277
            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle17;
276
            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
277
            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
278 278
            this.dgvMaster.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
279 279
            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
280
            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
281
            dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control;
282
            dataGridViewCellStyle18.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
283
            dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText;
284
            dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight;
285
            dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
286
            dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
287
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18;
280
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
281
            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
282
            dataGridViewCellStyle2.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
283
            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
284
            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
285
            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
286
            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
287
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
288 288
            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
289 289
            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
290 290
            this.Column1,
......
308 308
            // 
309 309
            // Column1
310 310
            // 
311
            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
312
            this.Column1.DefaultCellStyle = dataGridViewCellStyle19;
311
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
312
            this.Column1.DefaultCellStyle = dataGridViewCellStyle3;
313 313
            this.Column1.Frozen = true;
314 314
            this.Column1.HeaderText = "№";
315 315
            this.Column1.Name = "Column1";
......
320 320
            // 
321 321
            // Column2
322 322
            // 
323
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
324
            this.Column2.DefaultCellStyle = dataGridViewCellStyle20;
323
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
324
            this.Column2.DefaultCellStyle = dataGridViewCellStyle4;
325 325
            this.Column2.Frozen = true;
326 326
            this.Column2.HeaderText = "工事コード";
327 327
            this.Column2.Name = "Column2";
......
332 332
            // 
333 333
            // Column3
334 334
            // 
335
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
336
            this.Column3.DefaultCellStyle = dataGridViewCellStyle21;
335
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
336
            this.Column3.DefaultCellStyle = dataGridViewCellStyle5;
337 337
            this.Column3.Frozen = true;
338 338
            this.Column3.HeaderText = "営業期";
339 339
            this.Column3.Name = "Column3";
......
344 344
            // 
345 345
            // Column4
346 346
            // 
347
            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
348
            this.Column4.DefaultCellStyle = dataGridViewCellStyle22;
347
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
348
            this.Column4.DefaultCellStyle = dataGridViewCellStyle6;
349 349
            this.Column4.Frozen = true;
350 350
            this.Column4.HeaderText = "工 事 名 称";
351 351
            this.Column4.Name = "Column4";
......
356 356
            // 
357 357
            // Column5
358 358
            // 
359
            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
360
            this.Column5.DefaultCellStyle = dataGridViewCellStyle23;
359
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
360
            this.Column5.DefaultCellStyle = dataGridViewCellStyle7;
361 361
            this.Column5.Frozen = true;
362 362
            this.Column5.HeaderText = "営業担当者";
363 363
            this.Column5.Name = "Column5";
......
368 368
            // 
369 369
            // Column6
370 370
            // 
371
            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
372
            this.Column6.DefaultCellStyle = dataGridViewCellStyle24;
371
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
372
            this.Column6.DefaultCellStyle = dataGridViewCellStyle8;
373 373
            this.Column6.Frozen = true;
374 374
            this.Column6.HeaderText = "工事担当者";
375 375
            this.Column6.Name = "Column6";
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmNewOrContinueCopy.Designer.cs
109 109
            this.panel1.BackColor = System.Drawing.Color.Silver;
110 110
            this.panel1.Controls.Add(this.btnCancel);
111 111
            this.panel1.Controls.Add(this.btnExecProc1);
112
            this.panel1.Location = new System.Drawing.Point(-3, 582);
112
            this.panel1.Location = new System.Drawing.Point(-3, 607);
113 113
            this.panel1.Name = "panel1";
114 114
            this.panel1.Size = new System.Drawing.Size(833, 50);
115 115
            this.panel1.TabIndex = 3;
......
124 124
            this.groupBox2.Font = new System.Drawing.Font("MS 明朝", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
125 125
            this.groupBox2.Location = new System.Drawing.Point(12, 136);
126 126
            this.groupBox2.Name = "groupBox2";
127
            this.groupBox2.Size = new System.Drawing.Size(800, 310);
127
            this.groupBox2.Size = new System.Drawing.Size(800, 335);
128 128
            this.groupBox2.TabIndex = 7;
129 129
            this.groupBox2.TabStop = false;
130 130
            this.groupBox2.Text = "コピー種別・工事番号";
......
135 135
            this.panel5.Controls.Add(this.label18);
136 136
            this.panel5.Controls.Add(this.label17);
137 137
            this.panel5.Controls.Add(this.radioButton4);
138
            this.panel5.Location = new System.Drawing.Point(10, 230);
138
            this.panel5.Location = new System.Drawing.Point(10, 255);
139 139
            this.panel5.Name = "panel5";
140 140
            this.panel5.Size = new System.Drawing.Size(780, 70);
141 141
            this.panel5.TabIndex = 34;
......
157 157
            this.label17.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
158 158
            this.label17.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
159 159
            this.label17.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
160
            this.label17.Location = new System.Drawing.Point(587, 3);
160
            this.label17.Location = new System.Drawing.Point(600, 3);
161 161
            this.label17.Name = "label17";
162 162
            this.label17.Size = new System.Drawing.Size(174, 24);
163 163
            this.label17.TabIndex = 32;
......
170 170
            this.radioButton4.AutoSize = true;
171 171
            this.radioButton4.Location = new System.Drawing.Point(18, 4);
172 172
            this.radioButton4.Name = "radioButton4";
173
            this.radioButton4.Size = new System.Drawing.Size(552, 23);
173
            this.radioButton4.Size = new System.Drawing.Size(594, 23);
174 174
            this.radioButton4.TabIndex = 31;
175
            this.radioButton4.Text = "工事情報・見積データをコピー【新規工事として作成】";
175
            this.radioButton4.Text = "工事情報・見積データをコピー【別途新規工事として作成】";
176 176
            this.radioButton4.UseVisualStyleBackColor = true;
177 177
            this.radioButton4.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
178 178
            // 
......
182 182
            this.panel4.Controls.Add(this.label16);
183 183
            this.panel4.Controls.Add(this.radioButton3);
184 184
            this.panel4.Controls.Add(this.label15);
185
            this.panel4.Location = new System.Drawing.Point(10, 160);
185
            this.panel4.Location = new System.Drawing.Point(10, 185);
186 186
            this.panel4.Name = "panel4";
187 187
            this.panel4.Size = new System.Drawing.Size(780, 70);
188 188
            this.panel4.TabIndex = 33;
......
193 193
            this.label16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
194 194
            this.label16.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
195 195
            this.label16.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
196
            this.label16.Location = new System.Drawing.Point(587, 3);
196
            this.label16.Location = new System.Drawing.Point(600, 3);
197 197
            this.label16.Name = "label16";
198 198
            this.label16.Size = new System.Drawing.Size(174, 24);
199 199
            this.label16.TabIndex = 28;
......
229 229
            this.panel3.Controls.Add(this.label5);
230 230
            this.panel3.Controls.Add(this.label8);
231 231
            this.panel3.Controls.Add(this.radioButton2);
232
            this.panel3.Location = new System.Drawing.Point(10, 90);
232
            this.panel3.Location = new System.Drawing.Point(10, 115);
233 233
            this.panel3.Name = "panel3";
234 234
            this.panel3.Size = new System.Drawing.Size(780, 70);
235 235
            this.panel3.TabIndex = 32;
......
240 240
            this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
241 241
            this.label5.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
242 242
            this.label5.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
243
            this.label5.Location = new System.Drawing.Point(587, 3);
243
            this.label5.Location = new System.Drawing.Point(600, 3);
244 244
            this.label5.Name = "label5";
245 245
            this.label5.Size = new System.Drawing.Size(174, 24);
246 246
            this.label5.TabIndex = 25;
......
273 273
            // panel2
274 274
            // 
275 275
            this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
276
            this.panel2.Controls.Add(this.label1);
276 277
            this.panel2.Controls.Add(this.label6);
277 278
            this.panel2.Controls.Add(this.radioButton1);
278
            this.panel2.Controls.Add(this.label1);
279 279
            this.panel2.Location = new System.Drawing.Point(10, 20);
280 280
            this.panel2.Name = "panel2";
281
            this.panel2.Size = new System.Drawing.Size(780, 70);
281
            this.panel2.Size = new System.Drawing.Size(780, 95);
282 282
            this.panel2.TabIndex = 31;
283 283
            // 
284 284
            // label6
......
288 288
            this.label6.ForeColor = System.Drawing.Color.Red;
289 289
            this.label6.Location = new System.Drawing.Point(34, 28);
290 290
            this.label6.Name = "label6";
291
            this.label6.Size = new System.Drawing.Size(590, 38);
291
            this.label6.Size = new System.Drawing.Size(590, 57);
292 292
            this.label6.TabIndex = 28;
293
            this.label6.Text = "既存工事をコピーして作成   【同じ工事として新規に作成されます】\r\n※工事内容の増減・変更に伴う見積変更の場合に使用";
293
            this.label6.Text = "既存工事をコピーして作成   【同じ工事として新規に作成されます】\r\n※工事内容の変更に伴う新規見積作成の場合に使用します\r\n ⦅増減工事は工事情報入力で作成して" +
294
    "ください⦆";
294 295
            // 
295 296
            // radioButton1
296 297
            // 
......
298 299
            this.radioButton1.Checked = true;
299 300
            this.radioButton1.Location = new System.Drawing.Point(18, 4);
300 301
            this.radioButton1.Name = "radioButton1";
301
            this.radioButton1.Size = new System.Drawing.Size(552, 23);
302
            this.radioButton1.Size = new System.Drawing.Size(594, 23);
302 303
            this.radioButton1.TabIndex = 27;
303 304
            this.radioButton1.TabStop = true;
304
            this.radioButton1.Text = "工事情報・見積データをコピー【同一工事として作成】";
305
            this.radioButton1.Text = "工事情報・見積データをコピー【同一新規工事として作成】";
305 306
            this.radioButton1.UseVisualStyleBackColor = true;
306 307
            this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
307 308
            // 
......
311 312
            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
312 313
            this.label1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
313 314
            this.label1.Font = new System.Drawing.Font("Century", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
314
            this.label1.Location = new System.Drawing.Point(587, 3);
315
            this.label1.Location = new System.Drawing.Point(600, 3);
315 316
            this.label1.Name = "label1";
316 317
            this.label1.Size = new System.Drawing.Size(174, 24);
317 318
            this.label1.TabIndex = 26;
......
486 487
            this.groupBox3.Controls.Add(this.tableLayoutPanel3);
487 488
            this.groupBox3.Controls.Add(this.lblNextMessage);
488 489
            this.groupBox3.Font = new System.Drawing.Font("MS 明朝", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
489
            this.groupBox3.Location = new System.Drawing.Point(12, 446);
490
            this.groupBox3.Location = new System.Drawing.Point(12, 472);
490 491
            this.groupBox3.Name = "groupBox3";
491 492
            this.groupBox3.Size = new System.Drawing.Size(800, 120);
492 493
            this.groupBox3.TabIndex = 18;
......
581 582
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
582 583
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
583 584
            this.BackColor = System.Drawing.Color.WhiteSmoke;
584
            this.ClientSize = new System.Drawing.Size(824, 631);
585
            this.ClientSize = new System.Drawing.Size(824, 656);
585 586
            this.Controls.Add(this.groupBox3);
586 587
            this.Controls.Add(this.groupBox2);
587 588
            this.Controls.Add(this.groupBox1);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs
684 684
        }
685 685
        #endregion
686 686

  
687
        #region ?v???O???X?o?[?\??????
688
        /// <summary>
689
        /// ?v???O???X?o?[?\??????
690
        /// </summary>
691
        /// <param name="bDisp"></param>
692
        private void DisplayControlProgressBar(bool bDisp)
693
        {
694
            try
695
            {
696
                ProgressBar.Visible = bDisp;
697
                ProgressBar.Minimum = 0;
698
                ProgressBar.Value = 0;
699

  
700
                btnEnd.Visible = !bDisp;
701
                btnLedgerStatus.Visible = !bDisp;
702

  
703
                numUDConstPro.Enabled = !bDisp;
704
                cmbDepartment.Enabled = !bDisp;
705

  
706
                this.Update();
707
            }
708
            catch (Exception ex)
709
            {
710
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
711
            }
712
        }
713
        #endregion
714

  
687 715
        #region ??????????U??????????
688 716
        /// <summary>
689 717
        /// ??????????U??????????
......
771 799
                dgv.Rows.Clear();
772 800

  
773 801
                // ?v???O???X?o?[???????
774
                prgber.Visible = true;
775
                prgber.Minimum = 0;
802
                // ?v???O???X?o?[?\??????
803
                DisplayControlProgressBar(true);
804
                // ?v???O???X?o?[??MAX??K????10???Z?b?g????
776 805
                prgber.Maximum = 10;
777
                prgber.Value = 0;
778 806

  
779 807
                // ----- ?S???????w?????J?n?E?I???N????????????
780 808
                ArrayList TargetList = new ArrayList();
......
899 927
                dgv.ResumeLayout();
900 928

  
901 929
                // ProgressBar??l???X????
902
                prgber.Value = prgber.Maximum;
903
                prgber.Update();
904
                prgber.Visible = false;
930
                DisplayControlProgressBar(false);
905 931
            }
906 932
        }
907 933
        #endregion
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/ConstrMATLList/FrmConstrMATLList.designer.cs
127 127
            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
128 128
            this.label3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
129 129
            this.label3.ForeColor = System.Drawing.Color.Black;
130
            this.label3.Location = new System.Drawing.Point(747, 19);
130
            this.label3.Location = new System.Drawing.Point(739, 19);
131 131
            this.label3.Name = "label3";
132 132
            this.label3.Size = new System.Drawing.Size(120, 25);
133 133
            this.label3.TabIndex = 4;
......
220 220
            this.cmbConstructionPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
221 221
            this.cmbConstructionPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
222 222
            this.cmbConstructionPerson.FormattingEnabled = true;
223
            this.cmbConstructionPerson.Location = new System.Drawing.Point(875, 20);
223
            this.cmbConstructionPerson.Location = new System.Drawing.Point(867, 20);
224 224
            this.cmbConstructionPerson.Name = "cmbConstructionPerson";
225 225
            this.cmbConstructionPerson.Size = new System.Drawing.Size(200, 23);
226 226
            this.cmbConstructionPerson.TabIndex = 2;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PersonApprovalList/FrmPersonAppList.Designer.cs
28 28
        /// </summary>
29 29
        private void InitializeComponent()
30 30
        {
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
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 42
            this.label1 = new System.Windows.Forms.Label();
43 43
            this.btnEnd = new System.Windows.Forms.Button();
44 44
            this.comboBox1 = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
......
123 123
            this.dgvApproval.AllowUserToDeleteRows = false;
124 124
            this.dgvApproval.AllowUserToResizeColumns = false;
125 125
            this.dgvApproval.AllowUserToResizeRows = false;
126
            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
127
            this.dgvApproval.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle12;
126
            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
127
            this.dgvApproval.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
128 128
            this.dgvApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
129 129
            | System.Windows.Forms.AnchorStyles.Left) 
130 130
            | System.Windows.Forms.AnchorStyles.Right)));
131 131
            this.dgvApproval.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
132 132
            this.dgvApproval.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
133
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
134
            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control;
135
            dataGridViewCellStyle13.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
136
            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText;
137
            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
138
            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
139
            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
140
            this.dgvApproval.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13;
133
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
134
            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
135
            dataGridViewCellStyle2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
136
            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
137
            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
138
            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
139
            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
140
            this.dgvApproval.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
141 141
            this.dgvApproval.ColumnHeadersHeight = 24;
142 142
            this.dgvApproval.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
143 143
            this.dgvApproval.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
......
166 166
            // 
167 167
            // ApprovalColumn02
168 168
            // 
169
            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
170
            dataGridViewCellStyle14.BackColor = System.Drawing.Color.White;
171
            dataGridViewCellStyle14.ForeColor = System.Drawing.Color.Black;
172
            this.ApprovalColumn02.DefaultCellStyle = dataGridViewCellStyle14;
169
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
170
            dataGridViewCellStyle3.BackColor = System.Drawing.Color.White;
171
            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black;
172
            this.ApprovalColumn02.DefaultCellStyle = dataGridViewCellStyle3;
173 173
            this.ApprovalColumn02.Frozen = true;
174 174
            this.ApprovalColumn02.HeaderText = "担当者コード";
175 175
            this.ApprovalColumn02.Name = "ApprovalColumn02";
......
181 181
            // 
182 182
            // ApprovalColumn01
183 183
            // 
184
            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
185
            dataGridViewCellStyle15.BackColor = System.Drawing.Color.White;
186
            dataGridViewCellStyle15.ForeColor = System.Drawing.Color.Black;
187
            this.ApprovalColumn01.DefaultCellStyle = dataGridViewCellStyle15;
184
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
185
            dataGridViewCellStyle4.BackColor = System.Drawing.Color.White;
186
            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
187
            this.ApprovalColumn01.DefaultCellStyle = dataGridViewCellStyle4;
188 188
            this.ApprovalColumn01.Frozen = true;
189 189
            this.ApprovalColumn01.HeaderText = "№";
190 190
            this.ApprovalColumn01.Name = "ApprovalColumn01";
......
205 205
            // 
206 206
            // ApprovalColumn03
207 207
            // 
208
            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
209
            dataGridViewCellStyle16.BackColor = System.Drawing.Color.White;
210
            dataGridViewCellStyle16.ForeColor = System.Drawing.Color.Black;
211
            this.ApprovalColumn03.DefaultCellStyle = dataGridViewCellStyle16;
208
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
209
            dataGridViewCellStyle5.BackColor = System.Drawing.Color.White;
210
            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Black;
211
            this.ApprovalColumn03.DefaultCellStyle = dataGridViewCellStyle5;
212 212
            this.ApprovalColumn03.Frozen = true;
213 213
            this.ApprovalColumn03.HeaderText = "担当者名";
214 214
            this.ApprovalColumn03.Name = "ApprovalColumn03";
......
218 218
            // 
219 219
            // Column2
220 220
            // 
221
            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
222
            dataGridViewCellStyle17.BackColor = System.Drawing.Color.White;
223
            dataGridViewCellStyle17.ForeColor = System.Drawing.Color.Black;
224
            this.Column2.DefaultCellStyle = dataGridViewCellStyle17;
221
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
222
            dataGridViewCellStyle6.BackColor = System.Drawing.Color.White;
223
            dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black;
224
            this.Column2.DefaultCellStyle = dataGridViewCellStyle6;
225 225
            this.Column2.Frozen = true;
226 226
            this.Column2.HeaderText = "申請項目";
227 227
            this.Column2.Name = "Column2";
......
232 232
            // 
233 233
            // ApprovalColumn06
234 234
            // 
235
            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
236
            dataGridViewCellStyle18.BackColor = System.Drawing.Color.White;
237
            dataGridViewCellStyle18.ForeColor = System.Drawing.Color.Black;
238
            this.ApprovalColumn06.DefaultCellStyle = dataGridViewCellStyle18;
235
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
236
            dataGridViewCellStyle7.BackColor = System.Drawing.Color.White;
237
            dataGridViewCellStyle7.ForeColor = System.Drawing.Color.Black;
238
            this.ApprovalColumn06.DefaultCellStyle = dataGridViewCellStyle7;
239 239
            this.ApprovalColumn06.Frozen = true;
240 240
            this.ApprovalColumn06.HeaderText = "申請日";
241 241
            this.ApprovalColumn06.Name = "ApprovalColumn06";
......
245 245
            // 
246 246
            // ApprovalColumn08
247 247
            // 
248
            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
249
            dataGridViewCellStyle19.BackColor = System.Drawing.Color.White;
250
            dataGridViewCellStyle19.ForeColor = System.Drawing.Color.Black;
251
            this.ApprovalColumn08.DefaultCellStyle = dataGridViewCellStyle19;
248
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
249
            dataGridViewCellStyle8.BackColor = System.Drawing.Color.White;
250
            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.Black;
251
            this.ApprovalColumn08.DefaultCellStyle = dataGridViewCellStyle8;
252 252
            this.ApprovalColumn08.HeaderText = "承認者1";
253 253
            this.ApprovalColumn08.Name = "ApprovalColumn08";
254 254
            this.ApprovalColumn08.ReadOnly = true;
......
257 257
            // 
258 258
            // ApprovalColumn09
259 259
            // 
260
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
261
            dataGridViewCellStyle20.BackColor = System.Drawing.Color.White;
262
            dataGridViewCellStyle20.ForeColor = System.Drawing.Color.Black;
263
            this.ApprovalColumn09.DefaultCellStyle = dataGridViewCellStyle20;
260
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
261
            dataGridViewCellStyle9.BackColor = System.Drawing.Color.White;
262
            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Black;
263
            this.ApprovalColumn09.DefaultCellStyle = dataGridViewCellStyle9;
264 264
            this.ApprovalColumn09.HeaderText = "承認者2";
265 265
            this.ApprovalColumn09.Name = "ApprovalColumn09";
266 266
            this.ApprovalColumn09.ReadOnly = true;
......
269 269
            // 
270 270
            // ApprovalColumn10
271 271
            // 
272
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
273
            dataGridViewCellStyle21.BackColor = System.Drawing.Color.White;
274
            dataGridViewCellStyle21.ForeColor = System.Drawing.Color.Black;
275
            this.ApprovalColumn10.DefaultCellStyle = dataGridViewCellStyle21;
272
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
273
            dataGridViewCellStyle10.BackColor = System.Drawing.Color.White;
274
            dataGridViewCellStyle10.ForeColor = System.Drawing.Color.Black;
275
            this.ApprovalColumn10.DefaultCellStyle = dataGridViewCellStyle10;
276 276
            this.ApprovalColumn10.HeaderText = "承認者3";
277 277
            this.ApprovalColumn10.Name = "ApprovalColumn10";
278 278
            this.ApprovalColumn10.ReadOnly = true;
......
281 281
            // 
282 282
            // ApprovalColumn11
283 283
            // 
284
            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
285
            dataGridViewCellStyle22.BackColor = System.Drawing.Color.White;
286
            dataGridViewCellStyle22.ForeColor = System.Drawing.Color.Black;
287
            this.ApprovalColumn11.DefaultCellStyle = dataGridViewCellStyle22;
284
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
285
            dataGridViewCellStyle11.BackColor = System.Drawing.Color.White;
286
            dataGridViewCellStyle11.ForeColor = System.Drawing.Color.Black;
287
            this.ApprovalColumn11.DefaultCellStyle = dataGridViewCellStyle11;
288 288
            this.ApprovalColumn11.HeaderText = "承認者4";
289 289
            this.ApprovalColumn11.Name = "ApprovalColumn11";
290 290
            this.ApprovalColumn11.ReadOnly = true;
......
316 316
            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
317 317
            this.label3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
318 318
            this.label3.ForeColor = System.Drawing.Color.Black;
319
            this.label3.Location = new System.Drawing.Point(786, 19);
319
            this.label3.Location = new System.Drawing.Point(778, 19);
320 320
            this.label3.Name = "label3";
321 321
            this.label3.Size = new System.Drawing.Size(120, 25);
322 322
            this.label3.TabIndex = 4;
......
359 359
            this.cmbConstructionPerson.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
360 360
            this.cmbConstructionPerson.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
361 361
            this.cmbConstructionPerson.FormattingEnabled = true;
362
            this.cmbConstructionPerson.Location = new System.Drawing.Point(914, 20);
362
            this.cmbConstructionPerson.Location = new System.Drawing.Point(906, 20);
363 363
            this.cmbConstructionPerson.Name = "cmbConstructionPerson";
364 364
            this.cmbConstructionPerson.Size = new System.Drawing.Size(200, 24);
365 365
            this.cmbConstructionPerson.TabIndex = 2;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs
2484 2484
                          || r.Cells[(int)DispColumn.TantoShonin].Style.ForeColor != Color.Gray
2485 2485
                          || CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value) != 0)
2486 2486
                        {
2487
                            strPdDWhere = IoPdD.CreatePrimarykeyString(CommonMotions.cnvInt(r.Cells[m_Company_Column].Value), TargetDate, CommonMotions.cnvInt(r.Cells[(int)DispColumn.GroupSeqNo].Value), iLineCount);
2487
                            strPdDWhere = IoPdD.CreatePrimarykeyString(CommonMotions.cnvInt(r.Cells[m_Company_Column].Value),
2488
                                                                        TargetDate,
2489
                                                                        CommonMotions.cnvInt(r.Cells[(int)DispColumn.GroupSeqNo].Value),
2490
                                                                        iLineCount);
2488 2491
                            PdDList = new List<PaymentDataDetail>();
2489 2492

  
2490 2493
                            // ?f?[?^?m?F
......
2520 2523
                                // ?S?????F
2521 2524
                                if (r.Cells[(int)DispColumn.TantoShonin].Style.ForeColor != Color.Gray)
2522 2525
                                {
2526
                                    PdDWork.ApprovalPersonCode = CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value);
2523 2527
                                    if (r.Cells[(int)DispColumn.TantoDate].Value == null)
2524 2528
                                    {
2525
                                        PdDWork.ApprovalPersonCode = CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value);
2526 2529
                                        PdDWork.ApprovalDate = DateTime.Now;
2527 2530
                                    }
2528 2531
                                    else
2529 2532
                                    {
2530
                                        PdDWork.ApprovalPersonCode = CommonMotions.cnvInt(r.Cells[(int)DispColumn.TantoShoninCode].Value);
2531 2533
                                        PdDWork.ApprovalDate = CommonMotions.cnvDate(r.Cells[(int)DispColumn.TantoDate].Value);
2532 2534
                                    }
2533

  
2534 2535
                                }
2535 2536
                                else
2536 2537
                                {
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
708 708
                                                               .Sum(y => CommonMotions.cnvInt(y.Cells[(int)DispColumn.SomuSeikyu].Value));
709 709

  
710 710
                int iKosoku = 0, iKanamono = 0, iSanpai = 0;////?????????U?p
711
                string KojiTanto = "", KojiTantoCode="";
711
                string KojiTanto = "", KojiTantoCode = "";
712 712

  
713 713
                // ??????????
714 714
                if (m_UserInfo.m_Type == CommonDefine.SecurityRankPos.SpecialAuthority)
......
741 741
                constructionFieldNameHeader.PersonCharge = PersonCharge;
742 742

  
743 743
                DataGridViewRow[] rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
744
                    && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == 1
744
                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == 1
745 745
                                                                        && (DataRowState)x.Cells[(int)DispColumn.RowState].Value != DataRowState.Deleted
746 746
                                                                        && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == iCompanyCode
747 747
                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == iSeqNo)
......
760 760
                    }
761 761

  
762 762
                    //????s??????
763
                    string sGenbaName = CommonMotions.cnvString(r.Cells[m_GenbaNM_Column].Value) == "" ? CommonMotions.cnvString(r.Cells[m_GenbaNM_Column].ToolTipText) : CommonMotions.cnvString(r.Cells[m_GenbaNM_Column].Value);
763
                    string sGenbaName = CommonMotions.cnvString(r.Cells[m_GenbaNM_Column].Value) == ""
764
                                        ? CommonMotions.cnvString(r.Cells[m_GenbaNM_Column].ToolTipText)
765
                                        : CommonMotions.cnvString(r.Cells[m_GenbaNM_Column].Value);
764 766
                    constructionFieldNameHeader.ConstructionFieldNameDetails.Add(
765
                    //?s????A?H??????A?H?????A??????????z?A???t???O?A????p?t???O(???F?????t???O)
767
                        //?s????A?H??????A?H?????A??????????z?A???t???O?A????p?t???O(???F?????t???O)
766 768
                    new ConstructionFieldNameDetail(CommonMotions.cnvInt(r.Cells[(int)DispColumn.LineCount].Value),
767 769
                                                    CommonMotions.cnvInt(r.Cells[m_Genba_Column].Value),
768 770
                                                    sGenbaName,
769 771
                                                    CommonMotions.cnvInt(r.Cells[(int)DispColumn.SomuSeikyu].Value), false,
770 772
                                                    bReadOnly));
771 773

  
772
                    if(CommonMotions.cnvInt(r.Cells[m_Genba_Column].Value)==0) //??????
774
                    if (CommonMotions.cnvInt(r.Cells[m_Genba_Column].Value) == 0) //??????
773 775
                    {
774 776
                        iKosoku = CommonMotions.cnvInt(r.Cells[(int)DispColumn.SomuKosoku].Value);
775 777
                        iKanamono = CommonMotions.cnvInt(r.Cells[(int)DispColumn.SomuKanamono].Value);
......
781 783
                //????o?^?????o??
782 784
                frmRegField.ConstructionFieldNameHeader = constructionFieldNameHeader;
783 785
                frmRegField.ShowDialog();
784
                if (frmRegField.EndButton == DialogResult.OK)
786

  
787
                // ?I???{?^?????????????I??
788
                if (frmRegField.EndButton != DialogResult.OK)
785 789
                {
786
                    //??X?????l??\???s??????
787
                    foreach (ConstructionFieldNameDetail detail in frmRegField.ConstructionFieldNameHeader.ConstructionFieldNameDetails.OrderBy(x=>x.DeleteFlag==true? 1:0))
790
                    m_bChengeAns = true;
791
                    return;
792
                }
793

  
794
                // ----- ?I?????????????
795
                //??X?????l??\???s??????
796
                foreach (ConstructionFieldNameDetail detail in frmRegField.ConstructionFieldNameHeader.ConstructionFieldNameDetails.OrderBy(x => x.DeleteFlag == true ? 1 : 0))
797
                {
798
                    if (detail.ReadOnly == false)
788 799
                    {
789
                        if (detail.ReadOnly == false)
800
                        string sCompanyName = "", sGenbaName = "";
801
                        arData = null;
802
                        bool bGoukeiDelete = false;
803

  
804
                        if (m_viewTarget == 0)
790 805
                        {
791
                            string sCompanyName = "", sGenbaName = "";
792
                            arData = null;
793
                            bool bGoukeiDelete = false;
806
                            iGoukeiCode = iCompanyCode;
807
                            sGenbaName = detail.FieldName;
808
                        }
809
                        else
810
                        {
811
                            iGoukeiCode = detail.ConstructionCode;
812
                            sCompanyName = constructionFieldNameHeader.CompanyName;
813
                        }
794 814

  
795
                            if (m_viewTarget == 0)
796
                            {
797
                                iGoukeiCode = iCompanyCode;
798
                                sGenbaName = detail.FieldName;
799
                            }
800
                            else
801
                            {
802
                                iGoukeiCode = detail.ConstructionCode;
803
                                sCompanyName = constructionFieldNameHeader.CompanyName;
804
                            }
815
                        KojiTanto = "";
816
                        KojiTantoCode = "";
805 817

  
806
                            KojiTanto = "";
807
                            KojiTantoCode = "";
818
                        // ?s???s??O
819
                        if (detail.ConstructionCode != 0)
820
                        {
821
                            // ?I???????H????H???S??????????????????
822
                            ConstructionBaseInfo Cbi = new ConstructionBaseInfo();
823
                            PersonInChargeMaster Picm = new PersonInChargeMaster();
824
                            string sWhere = IoCbi.CreatePrimarykeyString(detail.ConstructionCode);
825
                            if (!IoCbi.SelectAction(sWhere, ref Cbi)) throw new Exception("?H????{?????G???[");
808 826

  
809
                            // ?s???s??O
810
                            if (detail.ConstructionCode != 0)
811
                            {
812
                                // ?I???????H????H???S??????????????????
813
                                ConstructionBaseInfo Cbi = new ConstructionBaseInfo();
814
                                PersonInChargeMaster Picm = new PersonInChargeMaster();
815
                                string sWhere = IoCbi.CreatePrimarykeyString(detail.ConstructionCode);
816
                                if (!IoCbi.SelectAction(sWhere, ref Cbi)) throw new Exception("?H????{?????G???[");
827
                            sWhere = IoMpic.CreatePrimarykeyString(Cbi.ConstructionPersonCode);
828
                            if (!IoMpic.SelectAction(sWhere, ref Picm)) throw new Exception("?S????}?X?^???G???[");
829
                            ConstrDepartmentCode = Picm.DepartmentCode;
817 830

  
818
                                sWhere = IoMpic.CreatePrimarykeyString(Cbi.ConstructionPersonCode);
819
                                if (!IoMpic.SelectAction(sWhere, ref Picm)) throw new Exception("?S????}?X?^???G???[");
820
                                ConstrDepartmentCode = Picm.DepartmentCode;
831
                            //?H???S????
832
                            KojiTantoCode = Picm.PersonCode.ToString();
833
                            KojiTanto = Picm.SealPrintName;
821 834

  
822
                                //?H???S????
823
                                KojiTantoCode = Picm.PersonCode.ToString();
824
                                KojiTanto = Picm.SealPrintName;
835
                            // ???????X???E??????????E?\?Z????l??
836
                            arData = new ArrayList();
837
                            if (!GetMarubatu(IoCbi, detail.ConstructionCode, ref arData)) throw new Exception("?H????{???E???F?f?[?^?G???[");
838
                        }
825 839

  
826
                                // ???????X???E??????????E?\?Z????l??
827
                                arData = new ArrayList();
828
                                if (!GetMarubatu(IoCbi, detail.ConstructionCode, ref arData)) throw new Exception("?H????{???E???F?f?[?^?G???[");
829
                            }
840
                        // ??????s???????
841
                        int iRowIndex = SearchRowIndex(m_Company_Column, iCompanyCode, GoukeiRows.???v, iSeqNo, CommonMotions.cnvInt(detail.LineCount));
830 842

  
831
                            // ??????s???????
832
                            int iRowIndex = SearchRowIndex(m_Company_Column, iCompanyCode, GoukeiRows.???v, iSeqNo, CommonMotions.cnvInt(detail.LineCount));
833

  
834
                            //?????????U
835
                            if (detail.ConstructionCode == 0 && detail.DeleteFlag == true)
843
                        //?????????U
844
                        if (detail.ConstructionCode == 0 && detail.DeleteFlag == true)
845
                        {
846
                            dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKosoku].Value = 0;
847
                            dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKanamono].Value = 0;
848
                            dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuSannhaiZei].Value = 0;
849
                        }
850
                        else if (detail.DeleteFlag == true)
851
                        {
852
                            if (CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKosoku].Value) > 0)
836 853
                            {
837
                                dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKosoku].Value = 0;
838
                                dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKanamono].Value = 0;
839
                                dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuSannhaiZei].Value = 0;
854
                                iKosoku = CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKosoku].Value);
840 855
                            }
841
                            else if (detail.DeleteFlag == true)
856
                            if (CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKanamono].Value) > 0)
842 857
                            {
843
                                if(CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKosoku].Value)>0)
858
                                iKanamono = CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKanamono].Value);
859
                            }
860
                            if (CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuSannhaiZei].Value) > 0)
861
                            {
862
                                iSanpai = CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuSannhaiZei].Value);
863
                            }
864
                        }
865

  
866
                        if (iRowIndex != -1)
867
                        {
868
                            if (detail.DeleteFlag == true)
869
                            {
870
                                if ((DataRowState)dgv.Rows[iRowIndex].Cells[(int)DispColumn.RowState].Value == DataRowState.Added)
844 871
                                {
845
                                    iKosoku = CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKosoku].Value);
872
                                    //???}?[?N(?L?[????L?^)
873
                                    DeleteRowKeys.Add(new RequestGridKeys(0, //CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.RowVisible].Value),
874
                                                                          CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[m_Company_Column].Value),
875
                                                                          CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[m_Genba_Column].Value),
876
                                                                          CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.RowType].Value),
877
                                                                          CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.GroupSeqNo].Value),
878
                                                                          CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.LineCount].Value)));
879

  
880
                                    dgv.Rows[iRowIndex].Cells[(int)DispColumn.RowVisible].Value = 0;
846 881
                                }
847
                                if (CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKanamono].Value) > 0)
882
                                else
848 883
                                {
849
                                    iKanamono = CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKanamono].Value);
884
                                    dgv.Rows[iRowIndex].Cells[(int)DispColumn.RowState].Value = DataRowState.Deleted;
885
                                    dgv.Rows[iRowIndex].Cells[(int)DispColumn.RowVisible].Value = 0;
886
                                    dgv.Rows[iRowIndex].Visible = false;
850 887
                                }
851
                                if (CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuSannhaiZei].Value) > 0)
888
                                if (m_viewTarget == 1)
852 889
                                {
853
                                    iSanpai = CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuSannhaiZei].Value);
890
                                    DeleteGoukeiRows(CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[m_GoukeiCode_Column].Value), ref bGoukeiDelete);
854 891
                                }
855 892
                            }
893
                            else
894
                            {
895
                                dgv.Rows[iRowIndex].Cells[m_Genba_Column].Value = detail.ConstructionCode;
896
                                dgv.Rows[iRowIndex].Cells[m_GenbaNM_Column].Value = detail.FieldName;
897
                                dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuSeikyu].Value = detail.BillPrice;
856 898

  
857
                            if (iRowIndex != -1)
858
                            {
859
                                if (detail.DeleteFlag == true)
899
                                ////?????????U ??????s????U??
900
                                if (iKosoku > 0)
860 901
                                {
861
                                    if ((DataRowState)dgv.Rows[iRowIndex].Cells[(int)DispColumn.RowState].Value == DataRowState.Added)
862
                                    {
863
                                        //???}?[?N(?L?[????L?^)
864
                                        DeleteRowKeys.Add(new RequestGridKeys(0, //CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.RowVisible].Value),
865
                                                                              CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[m_Company_Column].Value),
866
                                                                              CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[m_Genba_Column].Value),
867
                                                                              CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.RowType].Value),
868
                                                                              CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.GroupSeqNo].Value),
869
                                                                              CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[(int)DispColumn.LineCount].Value)));
870
                                                                                
871
                                        dgv.Rows[iRowIndex].Cells[(int)DispColumn.RowVisible].Value = 0;
872
                                    }
873
                                    else
874
                                    {
875
                                        dgv.Rows[iRowIndex].Cells[(int)DispColumn.RowState].Value = DataRowState.Deleted;
876
                                        dgv.Rows[iRowIndex].Cells[(int)DispColumn.RowVisible].Value = 0;
877
                                        dgv.Rows[iRowIndex].Visible = false;
878
                                    }
879
                                    if (m_viewTarget == 1)
880
                                    {
881
                                        DeleteGoukeiRows(CommonMotions.cnvInt(dgv.Rows[iRowIndex].Cells[m_GoukeiCode_Column].Value), ref bGoukeiDelete);
882
                                    }
902
                                    dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKosoku].Value = iKosoku;
903
                                    iKosoku = 0;
883 904
                                }
884
                                else
905
                                if (iKanamono > 0)
885 906
                                {
886
                                    dgv.Rows[iRowIndex].Cells[m_Genba_Column].Value = detail.ConstructionCode;
887
                                    dgv.Rows[iRowIndex].Cells[m_GenbaNM_Column].Value = detail.FieldName;
888
                                    dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuSeikyu].Value = detail.BillPrice;
907
                                    dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKanamono].Value = iKanamono;
908
                                    iKanamono = 0;
909
                                }
910
                                if (iSanpai > 0)
911
                                {
912
                                    dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuSannhaiZei].Value = iSanpai;
913
                                    iSanpai = 0;
914
                                }
915
                            }
916
                        }
917
                        else
918
                        {
889 919

  
890
                                    ////?????????U ??????s????U??
891
                                    if (iKosoku > 0)
920
                            DataGridViewRow[] MaxRow;
921
                            int iNo = 0;
922
                            bool bNewGoukei = false;
923
                            int iFumeiIndex = -1;
924
                            if (m_viewTarget == 0)
925
                            {
926
                                //???s??????(?B??????s??????)
927
                                int MaxLineCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == iCompanyCode
928
                                                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == iSeqNo)
929
                                                                                   .Max(y => CommonMotions.cnvInt(y.Cells[(int)DispColumn.LineCount].Value));
930

  
931
                                MaxRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == iCompanyCode
932
                                                                                                    && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == iSeqNo
933
                                                                                                    && CommonMotions.cnvInt(x.Cells[(int)DispColumn.LineCount].Value) == MaxLineCount)
934
                                                                                           .ToArray();
935
                                if (MaxRow.Count() > 1)
936
                                {
937
                                    DataGridViewRow dgvr = null;
938
                                    foreach (DataGridViewRow r in MaxRow)
892 939
                                    {
893
                                        dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKosoku].Value = iKosoku;
894
                                        iKosoku = 0;
940
                                        dgvr = r;
941
                                        if (CommonMotions.cnvInt(r.Cells[(int)DispColumn.RowVisible].Value) == 1) break;
895 942
                                    }
896
                                    if (iKanamono > 0)
897
                                    {
898
                                        dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuKanamono].Value = iKanamono;
899
                                        iKanamono = 0;
900
                                    }
901
                                    if (iSanpai > 0)
902
                                    {
903
                                        dgv.Rows[iRowIndex].Cells[(int)DispColumn.SomuSannhaiZei].Value = iSanpai;
904
                                        iSanpai = 0;
905
                                    }
943
                                    MaxRow = new DataGridViewRow[] { dgvr };
906 944
                                }
907 945
                            }
908 946
                            else
909 947
                            {
948
                                //?@??????R?[?h????????????????
949
                                string MaxGoukeiSeq = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == detail.ConstructionCode
950
                                                                                             && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == 1)
951
                                                                                   .Max(y => CommonMotions.cnvString(y.Cells[(int)DispColumn.GoukeiSeqNo].Value));
910 952

  
911
                                DataGridViewRow[] MaxRow;
912
                                int iNo = 0;
913
                                bool bNewGoukei = false;
914
                                int iFumeiIndex = -1;
915
                                if (m_viewTarget == 0)
953
                                if (MaxGoukeiSeq == null)
916 954
                                {
917
                                    //???s??????(?B??????s??????)
918
                                    int MaxLineCount = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == iCompanyCode
919
                                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == iSeqNo)
920
                                                                                       .Max(y => CommonMotions.cnvInt(y.Cells[(int)DispColumn.LineCount].Value));
955
                                    // ?f?[?^???????????i?V?K????R?[?h?j
956
                                    bNewGoukei = true;
957
                                    MaxRow = new DataGridViewRow[] { dgv.Rows[dgv.Rows.Count - 1] };
921 958

  
922
                                    MaxRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == iCompanyCode
923
                                                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == iSeqNo
924
                                                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.LineCount].Value) == MaxLineCount)
925
                                                                                               .ToArray();
926
                                    if (MaxRow.Count() > 1)
959
                                    if (m_viewTarget == 1 && detail.ConstructionCode == 0)
927 960
                                    {
928
                                        DataGridViewRow dgvr = null;
929
                                        foreach(DataGridViewRow r in MaxRow)
930
                                        {
931
                                            dgvr = r;
932
                                            if (CommonMotions.cnvInt(r.Cells[(int)DispColumn.RowVisible].Value) == 1) break;
933
                                        }
934
                                        MaxRow = new DataGridViewRow[] { dgvr };
961
                                        iFumeiIndex = 0;
935 962
                                    }
963

  
964
                                    // No?l
965
                                    iNo = dgv.Rows.Cast<DataGridViewRow>().Max(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.No].Value.ToString()));
966
                                    iNo++;
936 967
                                }
937 968
                                else
938 969
                                {
939
                                    //?@??????R?[?h????????????????
940
                                    string MaxGoukeiSeq = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == detail.ConstructionCode
941
                                                                                                 && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == 1)
942
                                                                                       .Max(y => CommonMotions.cnvString(y.Cells[(int)DispColumn.GoukeiSeqNo].Value));
970
                                    // ???????f?[?^??C???f?b?N?X????
971
                                    MaxRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == detail.ConstructionCode
972
                                                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GoukeiSeqNo].Value) == CommonMotions.cnvInt(MaxGoukeiSeq))
973
                                                                                               .ToArray();
974
                                }
975
                            }
976
                            int MakeIndex = 0;
977
                            int SendMakeIndex;
978
                            if (m_viewTarget == 0)
979
                            {
980
                                SendMakeIndex = iFumeiIndex == -1 ? MaxRow[0].Index : iFumeiIndex;
981
                            }
982
                            else
983
                            {
984
                                SendMakeIndex = iFumeiIndex == -1 ? MaxRow[0].Index + 1 : iFumeiIndex;
985
                            }
986
                            MakeNewRow(iCompanyCode, sCompanyName, detail.ConstructionCode, iNo, ref MakeIndex, iSeqNo, SendMakeIndex, detail.FieldName);
943 987

  
944
                                    if (MaxGoukeiSeq == null)
945
                                    {
946
                                        // ?f?[?^???????????i?V?K????R?[?h?j
947
                                        bNewGoukei = true;
948
                                        MaxRow = new DataGridViewRow[] { dgv.Rows[dgv.Rows.Count - 1] };
988
                            string sGoukeiName = m_viewTarget == 0 ? constructionFieldNameHeader.CompanyName : detail.FieldName;
989
                            dgv.Rows[MakeIndex].Cells[m_GoukeiCode_Column + 1].ToolTipText = sGoukeiName;
990
                            dgv.Rows[MakeIndex].Cells[(int)DispColumn.CompanyDispOrder].Value = CompanyDispOrder;
991
                            dgv.Rows[MakeIndex].Cells[(int)DispColumn.SomuSeikyu].Value = detail.BillPrice;
949 992

  
950
                                        if (m_viewTarget == 1 && detail.ConstructionCode == 0)
951
                                        {
952
                                            iFumeiIndex = 0;
953
                                        }
993
                            // ?s???s??O
994
                            if (detail.ConstructionCode != 0)
995
                            {
996
                                // ???F????
997
                                int iDefaultCount = 0;
998
                                if (!SetDefaultShonin(dgv, MakeIndex, ConstrDepartmentCode, ref iDefaultCount)) throw new Exception("???????F??l???G???[");
954 999

  
955
                                        // No?l
956
                                        iNo = dgv.Rows.Cast<DataGridViewRow>().Max(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.No].Value.ToString()));
957
                                        iNo++;
958
                                    }
959
                                    else
1000
                                // ???F??\??
1001
                                if (iDefaultCount > 0)
1002
                                {
1003
                                    for (int i = 0; i < iDefaultCount; i++)
960 1004
                                    {
961
                                        // ???????f?[?^??C???f?b?N?X????
962
                                        MaxRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == detail.ConstructionCode
963
                                                                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GoukeiSeqNo].Value) == CommonMotions.cnvInt(MaxGoukeiSeq))
964
                                                                                                   .ToArray();
1005
                                        dgv.Columns[(int)DispColumn.Shonin1 + (i * 5)].Visible = true;
965 1006
                                    }
966 1007
                                }
967
                                int MakeIndex = 0;
968
                                int SendMakeIndex;
969
                                if (m_viewTarget == 0)
1008

  
1009
                                if (arData != null && arData.Count != 0)
970 1010
                                {
971
                                    SendMakeIndex = iFumeiIndex == -1 ? MaxRow[0].Index : iFumeiIndex;
1011
                                    // ????????o?E???????????E?\?Z??
1012
                                    object[] row = (object[])arData[0];
1013
                                    dgv.Rows[MakeIndex].Cells[(int)DispColumn.CyuumonshoTeisyutu].Value = row[0];
1014
                                    dgv.Rows[MakeIndex].Cells[(int)DispColumn.CyuumonshoTouchaku].Value = row[1];
1015
                                    dgv.Rows[MakeIndex].Cells[(int)DispColumn.YosanSho].Value = row[2];
972 1016
                                }
973
                                else
974
                                {
975
                                    SendMakeIndex = iFumeiIndex == -1 ? MaxRow[0].Index + 1 : iFumeiIndex;
976
                                }
977
                                MakeNewRow(iCompanyCode, sCompanyName, detail.ConstructionCode, iNo, ref MakeIndex, iSeqNo, SendMakeIndex, detail.FieldName);
978 1017

  
979
                                string sGoukeiName = m_viewTarget == 0 ? constructionFieldNameHeader.CompanyName : detail.FieldName;
980
                                dgv.Rows[MakeIndex].Cells[m_GoukeiCode_Column + 1].ToolTipText = sGoukeiName;
981
                                dgv.Rows[MakeIndex].Cells[(int)DispColumn.CompanyDispOrder].Value = CompanyDispOrder;
982
                                dgv.Rows[MakeIndex].Cells[(int)DispColumn.SomuSeikyu].Value = detail.BillPrice;
1018
                                // ???e?X?g?p
1019
                                //if (CommonMotions.LoginUserData.PersonCode == 88889988)
1020
                                //{
1021
                                //    dgv.Rows[MakeIndex].Cells[(int)DispColumn.TantoShonin].Value = "?e?X?g";
1022
                                //}
1023
                                //else
1024
                                //{ 
1025
                                //?S??????F???
1026
                                dgv.Rows[MakeIndex].Cells[(int)DispColumn.TantoShoninCode].Value = KojiTantoCode;
1027
                                dgv.Rows[MakeIndex].Cells[(int)DispColumn.TantoShonin].Value = KojiTanto;
1028
                                dgv.Rows[MakeIndex].Cells[(int)DispColumn.TantoShonin].Style.ForeColor = Color.Gray;
1029
                                //}
983 1030

  
984
                                // ?s???s??O
985
                                if (detail.ConstructionCode != 0)
1031
                                ////?????????U ?????????????U??
1032
                                if (iKosoku > 0)
986 1033
                                {
987
                                    // ???F????
988
                                    int iDefaultCount = 0;
989
                                    if (!SetDefaultShonin(dgv, MakeIndex, ConstrDepartmentCode, ref iDefaultCount)) throw new Exception("???????F??l???G???[");
990

  
991
                                    // ???F??\??
992
                                    if(iDefaultCount>0)
993
                                    { 
994
                                        for (int i = 0; i<iDefaultCount;i++) 
995
                                        {
996
                                            dgv.Columns[(int)DispColumn.Shonin1+(i * 5)].Visible = true;
997
                                        }
998
                                    }
999

  
1000
                                    if (arData != null && arData.Count != 0)
1001
                                    {
1002
                                        // ????????o?E???????????E?\?Z??
1003
                                        object[] row = (object[])arData[0];
1004
                                        dgv.Rows[MakeIndex].Cells[(int)DispColumn.CyuumonshoTeisyutu].Value = row[0];
1005
                                        dgv.Rows[MakeIndex].Cells[(int)DispColumn.CyuumonshoTouchaku].Value = row[1];
1006
                                        dgv.Rows[MakeIndex].Cells[(int)DispColumn.YosanSho].Value = row[2];
1007
                                    }
1008

  
1009
                                    // ???e?X?g?p
1010
                                    //if (CommonMotions.LoginUserData.PersonCode == 88889988)
1011
                                    //{
1012
                                    //    dgv.Rows[MakeIndex].Cells[(int)DispColumn.TantoShonin].Value = "?e?X?g";
1013
                                    //}
1014
                                    //else
1015
                                    //{ 
1016
                                        //?S??????F???
1017
                                        dgv.Rows[MakeIndex].Cells[(int)DispColumn.TantoShoninCode].Value = KojiTantoCode;
1018
                                        dgv.Rows[MakeIndex].Cells[(int)DispColumn.TantoShonin].Value = KojiTanto;
1019
                                        dgv.Rows[MakeIndex].Cells[(int)DispColumn.TantoShonin].Style.ForeColor = Color.Gray;
1020
                                    //}
1021

  
1022
                                    ////?????????U ?????????????U??
1023
                                    if (iKosoku > 0)
1024
                                    {
1025
                                        dgv.Rows[MakeIndex].Cells[(int)DispColumn.SomuKosoku].Value = iKosoku;
1026
                                        iKosoku = 0;
1027
                                    }
1028
                                    if (iKanamono > 0)
1029
                                    {
1030
                                        dgv.Rows[MakeIndex].Cells[(int)DispColumn.SomuKanamono].Value = iKanamono;
1031
                                        iKanamono = 0;
1032
                                    }
1033
                                    if (iSanpai > 0)
1034
                                    {
1035
                                        dgv.Rows[MakeIndex].Cells[(int)DispColumn.SomuSannhaiZei].Value = iSanpai;
1036
                                        iSanpai = 0;
1037
                                    }
1034
                                    dgv.Rows[MakeIndex].Cells[(int)DispColumn.SomuKosoku].Value = iKosoku;
1035
                                    iKosoku = 0;
1038 1036
                                }
1039

  
1040
                                // ?V?K???v?s????????
1041
                                if (bNewGoukei == true)
1037
                                if (iKanamono > 0)
1042 1038
                                {
1043
                                    // ???v?s???(?V?K????v????????????)
1044
                                    MakeGoukeiGyo(dgv, detail.ConstructionCode, CompanyDispOrder, MakeIndex + 1);
1039
                                    dgv.Rows[MakeIndex].Cells[(int)DispColumn.SomuKanamono].Value = iKanamono;
1040
                                    iKanamono = 0;
1045 1041
                                }
1046

  
1042
                                if (iSanpai > 0)
1043
                                {
1044
                                    dgv.Rows[MakeIndex].Cells[(int)DispColumn.SomuSannhaiZei].Value = iSanpai;
1045
                                    iSanpai = 0;
1046
                                }
1047 1047
                            }
1048 1048

  
1049
                            if (bGoukeiDelete == false)
1049
                            // ?V?K???v?s????????
1050
                            if (bNewGoukei == true)
1050 1051
                            {
1051
                                // ???v?l?Z?o
1052
                                setGoukei_DataDisp(dgv, iGoukeiCode);
1052
                                // ???v?s???(?V?K????v????????????)
1053
                                MakeGoukeiGyo(dgv, detail.ConstructionCode, CompanyDispOrder, MakeIndex + 1);
1053 1054
                            }
1054 1055

  
1055 1056
                        }
1056
                    }
1057 1057

  
1058
                    if(iKosoku>0 || iSanpai > 0 || iKanamono>0 )
1059
                    {
1060
                        DataGridViewRow[] zappiRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
1061
                                                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == 1
1062
                                                                                            && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == iCompanyCode
1063
                                                                                            && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == iSeqNo
1064
                                                                                            && CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == 0).ToArray();
1065

  
1066
                        if(zappiRows != null)
1058
                        if (bGoukeiDelete == false)
1067 1059
                        {
1068
                            if (iKosoku > 0)
1069
                            {
1070
                                zappiRows[0].Cells[(int)DispColumn.SomuKosoku].Value = iKosoku;
1071
                                iKosoku = 0;
1072
                            }
1073
                            if (iKanamono > 0)
1074
                            {
1075
                                zappiRows[0].Cells[(int)DispColumn.SomuKanamono].Value = iKanamono;
1076
                                iKanamono = 0;
1077
                            }
1078
                            if (iSanpai > 0)
1079
                            {
1080
                                zappiRows[0].Cells[(int)DispColumn.SomuSannhaiZei].Value = iSanpai;
1081
                                iSanpai = 0;
1082
                            }
1060
                            // ???v?l?Z?o
1061
                            setGoukei_DataDisp(dgv, iGoukeiCode);
1083 1062
                        }
1063

  
1084 1064
                    }
1065
                }
1085 1066

  
1086
                    // ?}?[?N??????????????s???????????????
1087
                    foreach(RequestGridKeys delRow in DeleteRowKeys)
1067
                if (iKosoku > 0 || iSanpai > 0 || iKanamono > 0)
1068
                {
1069
                    DataGridViewRow[] zappiRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
1070
                                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == 1
1071
                                                                                        && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == iCompanyCode
1072
                                                                                        && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == iSeqNo
1073
                                                                                        && CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == 0).ToArray();
1074

  
1075
                    if (zappiRows != null)
1088 1076
                    {
1089
                        DataGridViewRow[] r = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == delRow.Visible
1090
                                                                                         && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == delRow.RowType
1091
                                                                                         && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == delRow.CompanyCode
1092
                                                                                         && CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == delRow.GenbaCode
1093
                                                                                         && CommonMotions.cnvInt(x.Cells[(int)DispColumn.GroupSeqNo].Value) == delRow.SeqNo
1094
                                                                                         && CommonMotions.cnvInt(x.Cells[(int)DispColumn.LineCount].Value) == delRow.LineCount)
1095
                                                                                         .ToArray();
1096
                        if(r!=null)
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

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