プロジェクト

全般

プロフィール

リビジョン 309

堀内約7年前に追加

資材返却:画面貸出日追加

差分を表示:

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

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMaterialReserveEntry.cs
382 382
                if (e.ColumnIndex == (int)DispColumn.RowState) return;
383 383

  
384 384
                DataGridView dgv = dgvMaster;
385
                DataGridViewRow CurRow = dgv.Rows[e.RowIndex];
385 386

  
386 387
                // null値は処理しない
387
                if (dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].Value == null) return;
388
                if (CurRow.Cells[e.ColumnIndex].Value == null) return;
388 389

  
389 390
                // 値のチェック(同じ場合は変更フラグをONにしない)
390 391
                if (m_CheckCol != e.ColumnIndex || m_CheckRow != e.RowIndex) return;
391
                int CurVal = CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value);
392
                int CurVal = CommonMotions.cnvInt(CurRow.Cells[e.ColumnIndex].Value);
392 393
                if (CommonMotions.cnvInt(m_BeforeValue) == CurVal) return;
393 394

  
394 395
                // 返却予定日の処理
395 396
                if (e.ColumnIndex == (int)DispColumn.RepayPlanDate) FormatRepayPlanDate(e);
396 397

  
397 398
                // 値が変わればツールチップを変更する
398
                dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].ToolTipText = CommonMotions.cnvString(dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].Value);
399
                CurRow.Cells[e.ColumnIndex].ToolTipText = CommonMotions.cnvString(CurRow.Cells[e.ColumnIndex].Value);
399 400

  
400 401
                // 行に変更フラグをON
401
                if ((DataRowState)dgv.Rows[e.RowIndex].Cells[(int)DispColumn.RowState].Value == DataRowState.Unchanged)
402
                    dgv.Rows[e.RowIndex].Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
402
                if ((DataRowState)CurRow.Cells[(int)DispColumn.RowState].Value == DataRowState.Unchanged)
403
                    CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
403 404

  
404 405
                // 変更フラグON
405 406
                m_bChengeAns = true;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMateRetEntAux.cs
523 523
                sql.AppendFormat(" And Mri.RECKIND = {0}", (int)MaterialRecordInfo.RecKindDef.Rental);
524 524

  
525 525
                sql.AppendLine(" order by");
526
                sql.AppendLine("   Mkm.DisplayOrder");
527
                sql.AppendLine("   , Mim.DisplayOrder ");
528
                sql.AppendLine("   , ProcessDate"); 
526
                sql.AppendLine("   Mkm.DisplayOrder ASC");
527
                sql.AppendLine("   , Mim.DisplayOrder ASC");
528
                sql.AppendLine("   , ProcessDate DESC");
529 529

  
530 530
                // データ取得
531 531
                if (!IoCmi.ExecuteReader(sql.ToString(), ref arData)) return false;
......
549 549
                    ReadDataKey[1] = CommonMotions.cnvInt(work[(int)DataColumn.MaterialItemCode]);
550 550
                    dtReadRentProcessDate = CommonMotions.cnvDate(work[(int)DataColumn.RentProcessDate]).Date;
551 551

  
552
                    if (ReadDataKey[1] == 100)
553
                    {
554
                        Debug.WriteLine("");
555
                    }
556 552
                    // 種類・品目が違えば表示
557 553
                    if (BreakKey[0] == ReadDataKey[0] && BreakKey[1] == ReadDataKey[1] && dtBreakRentProcessDate == dtReadRentProcessDate)
558 554
                    {
......
582 578
                    obiSumRec[(int)DispColumn.MaterialItemCode] = work[(int)DataColumn.MaterialItemCode];
583 579
                    obiSumRec[(int)DispColumn.MaterialItemName] = work[(int)DataColumn.MaterialItemName];
584 580
                    obiSumRec[(int)DispColumn.MaterialItemDisplayOrder] = work[(int)DataColumn.ItemDisp];
585
                    if (CommonMotions.cnvInt(work[(int)DataColumn.RecKind]) == (int)MaterialRecordInfo.RecKindDef.Rental)
586
                    {
587
                        obiSumRec[(int)DispColumn.RepayPlanDate] = work[(int)DataColumn.RepayPlanDate];
588
                    }
581
                    obiSumRec[(int)DispColumn.RentProcessDate] = work[(int)DataColumn.RentProcessDate];
582
                    obiSumRec[(int)DispColumn.RepayPlanDate] = work[(int)DataColumn.RepayPlanDate];
589 583
                    obiSumRec[(int)DispColumn.RentCount] = work[(int)DataColumn.RentCount];
590 584
                    obiSumRec[(int)DispColumn.RepayCount] = work[(int)DataColumn.RepayCount];
591 585
                    obiSumRec[(int)DispColumn.JunkCount] = work[(int)DataColumn.JunkCount];
......
598 592
                        obiSumRec[(int)DispColumn.CommentText] = work[(int)DataColumn.CommentText];
599 593
                    }
600 594
                    
601
                    obiSumRec[(int)DispColumn.RentProcessDate] = work[(int)DataColumn.RentProcessDate];
602 595
                    obiSumRec[(int)DispColumn.ComplateFlg] = work[(int)DataColumn.CompleteFlg];
603 596
                }
604 597

  
......
690 683
                }
691 684
                else
692 685
                {
686
                    // ----- 書込み禁止
687
                    int nColumnMax = Enum.GetNames(typeof(DispColumn)).Length;
688
                    for (int i = (int)DispColumn.MaterialItemCode; i < nColumnMax; i++)
689
                    {
690
                        // 返却終了は文字色を変える
691
                        dgvMaster.Rows[icnt].Cells[i].Style.ForeColor = Color.Gray;
692
                        // 返却終了は入力ロック
693
                        if (i <= (int)DispColumn.RentCount) dgvMaster.Rows[icnt].Cells[i].ReadOnly = true;
694
                    }
695
                    // 日付文字色変更
693 696
                    dgvMaster.Rows[icnt].Cells[(int)DispColumn.RepayPlanDate].Style.ForeColor = Color.White;
694 697
                    dgvMaster.Rows[icnt].Cells[(int)DispColumn.RepayPlanDate].Style.BackColor = Color.Black;
695 698
                    nCompCnt++;
696
                    // 書込み禁止
697
                    for (int i = (int)DispColumn.RentCount; i < (int)DispColumn.ComplateFlg; i++)
698
                    {
699
                        dgvMaster.Rows[icnt].Cells[i].ReadOnly = true;
700
                    }
701 699
                }
702 700
                dgvMaster.Rows[icnt].Cells[(int)DispColumn.RentProcessDate].Value = CommonMotions.cnvDate(work[(int)DispColumn.RentProcessDate]).ToShortDateString();
703 701
                dgvMaster.Rows[icnt].Cells[(int)DispColumn.ComplateFlg].Value = CommonMotions.cnvInt(work[(int)DispColumn.ComplateFlg]);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMaterialReturnEntry.cs
53 53
            MaterialItemCode,
54 54
            MaterialItemName,
55 55
            MaterialItemDisplayOrder,
56
            RentProcessDate,
56 57
            RepayPlanDate,
57 58
            RentCount,
58 59
            RepayCount,
......
61 62
            MaterialDumpCount,
62 63
            MaterialCountBefore,
63 64
            CommentText,
64
            RentProcessDate,
65 65
            ComplateFlg,
66 66
        }
67 67
        #endregion
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMaterialReturnEntry.designer.cs
31 31
        private void InitializeComponent()
32 32
        {
33 33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
35 35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
36 36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
37 37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
......
41 41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
42 42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
43 43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
44 46
            this.label1 = new System.Windows.Forms.Label();
45 47
            this.btnEnd = new System.Windows.Forms.Button();
46 48
            this.btnDataEntry = new System.Windows.Forms.Button();
......
66 68
            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
67 69
            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
68 70
            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
71
            this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn();
69 72
            this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
70 73
            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
71 74
            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
......
74 77
            this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
75 78
            this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
76 79
            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
77
            this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
78 80
            this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn();
79 81
            this.groupBoxEx2.SuspendLayout();
80 82
            this.groupBoxEx1.SuspendLayout();
......
320 322
            this.Column10,
321 323
            this.Column3,
322 324
            this.Column11,
325
            this.Column18,
323 326
            this.Column14,
324 327
            this.Column4,
325 328
            this.Column5,
......
328 331
            this.Column13,
329 332
            this.Column12,
330 333
            this.Column7,
331
            this.Column15,
332 334
            this.Column16});
333 335
            this.dgvMaster.EnableHeadersVisualStyles = false;
334 336
            this.dgvMaster.Location = new System.Drawing.Point(5, 6);
335 337
            this.dgvMaster.MultiSelect = false;
336 338
            this.dgvMaster.Name = "dgvMaster";
337
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
338
            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
339
            dataGridViewCellStyle11.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
340
            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
341
            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
342
            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
343
            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
344
            this.dgvMaster.RowHeadersDefaultCellStyle = dataGridViewCellStyle11;
339
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
340
            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control;
341
            dataGridViewCellStyle13.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
342
            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText;
343
            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
344
            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
345
            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
346
            this.dgvMaster.RowHeadersDefaultCellStyle = dataGridViewCellStyle13;
345 347
            this.dgvMaster.RowHeadersVisible = false;
346 348
            this.dgvMaster.RowHeadersWidth = 20;
347 349
            this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
......
402 404
            this.Column3.ReadOnly = true;
403 405
            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
404 406
            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
405
            this.Column3.Width = 300;
407
            this.Column3.Width = 325;
406 408
            // 
407 409
            // Column11
408 410
            // 
......
410 412
            this.Column11.Name = "Column11";
411 413
            this.Column11.Visible = false;
412 414
            // 
415
            // Column18
416
            // 
417
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
418
            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
419
            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Black;
420
            this.Column18.DefaultCellStyle = dataGridViewCellStyle5;
421
            this.Column18.HeaderText = "貸出日";
422
            this.Column18.Name = "Column18";
423
            this.Column18.ReadOnly = true;
424
            this.Column18.Resizable = System.Windows.Forms.DataGridViewTriState.False;
425
            this.Column18.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
426
            // 
413 427
            // Column14
414 428
            // 
415
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
416
            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
417
            this.Column14.DefaultCellStyle = dataGridViewCellStyle5;
429
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
430
            dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
431
            dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black;
432
            this.Column14.DefaultCellStyle = dataGridViewCellStyle6;
418 433
            this.Column14.HeaderText = "返却予定日";
419 434
            this.Column14.Name = "Column14";
420 435
            this.Column14.ReadOnly = true;
421 436
            this.Column14.Resizable = System.Windows.Forms.DataGridViewTriState.False;
422 437
            this.Column14.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
423
            this.Column14.Width = 125;
424 438
            // 
425 439
            // Column4
426 440
            // 
427
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
428
            dataGridViewCellStyle6.BackColor = System.Drawing.Color.WhiteSmoke;
429
            dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
430
            dataGridViewCellStyle6.Format = "#,0";
431
            this.Column4.DefaultCellStyle = dataGridViewCellStyle6;
441
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
442
            dataGridViewCellStyle7.BackColor = System.Drawing.Color.WhiteSmoke;
443
            dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
444
            dataGridViewCellStyle7.Format = "#,0";
445
            this.Column4.DefaultCellStyle = dataGridViewCellStyle7;
432 446
            this.Column4.HeaderText = "貸出数";
433 447
            this.Column4.Name = "Column4";
434 448
            this.Column4.ReadOnly = true;
435 449
            this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
436 450
            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
437
            this.Column4.Width = 90;
451
            this.Column4.Width = 80;
438 452
            // 
439 453
            // Column5
440 454
            // 
441
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
442
            dataGridViewCellStyle7.BackColor = System.Drawing.Color.WhiteSmoke;
443
            dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
444
            dataGridViewCellStyle7.Format = "#,0";
445
            this.Column5.DefaultCellStyle = dataGridViewCellStyle7;
455
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
456
            dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke;
457
            dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
458
            dataGridViewCellStyle8.Format = "#,0";
459
            this.Column5.DefaultCellStyle = dataGridViewCellStyle8;
446 460
            this.Column5.HeaderText = "返却済数";
447 461
            this.Column5.Name = "Column5";
448 462
            this.Column5.ReadOnly = true;
449 463
            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
450 464
            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
451
            this.Column5.Width = 90;
465
            this.Column5.Width = 80;
452 466
            // 
453 467
            // Column17
454 468
            // 
455
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
456
            dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke;
457
            dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
458
            this.Column17.DefaultCellStyle = dataGridViewCellStyle8;
469
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
470
            dataGridViewCellStyle9.BackColor = System.Drawing.Color.WhiteSmoke;
471
            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
472
            this.Column17.DefaultCellStyle = dataGridViewCellStyle9;
459 473
            this.Column17.HeaderText = "破棄済数";
460 474
            this.Column17.Name = "Column17";
461 475
            this.Column17.ReadOnly = true;
462 476
            this.Column17.Resizable = System.Windows.Forms.DataGridViewTriState.False;
463 477
            this.Column17.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
464
            this.Column17.Width = 90;
478
            this.Column17.Width = 80;
465 479
            // 
466 480
            // Column6
467 481
            // 
468
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
469
            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
470
            this.Column6.DefaultCellStyle = dataGridViewCellStyle9;
482
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
483
            dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
484
            this.Column6.DefaultCellStyle = dataGridViewCellStyle10;
471 485
            this.Column6.HeaderText = "返却数";
472 486
            this.Column6.Name = "Column6";
473 487
            this.Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
474 488
            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
475
            this.Column6.Width = 90;
489
            this.Column6.Width = 80;
476 490
            // 
477 491
            // Column13
478 492
            // 
479
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
480
            dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
481
            this.Column13.DefaultCellStyle = dataGridViewCellStyle10;
493
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
494
            dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
495
            this.Column13.DefaultCellStyle = dataGridViewCellStyle11;
482 496
            this.Column13.HeaderText = "破棄数";
483 497
            this.Column13.Name = "Column13";
484 498
            this.Column13.Resizable = System.Windows.Forms.DataGridViewTriState.False;
485 499
            this.Column13.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
486
            this.Column13.Width = 90;
500
            this.Column13.Width = 80;
487 501
            // 
488 502
            // Column12
489 503
            // 
......
493 507
            // 
494 508
            // Column7
495 509
            // 
510
            dataGridViewCellStyle12.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
511
            dataGridViewCellStyle12.ForeColor = System.Drawing.Color.Black;
512
            this.Column7.DefaultCellStyle = dataGridViewCellStyle12;
496 513
            this.Column7.HeaderText = "コメント";
497 514
            this.Column7.Name = "Column7";
498 515
            this.Column7.Resizable = System.Windows.Forms.DataGridViewTriState.False;
499 516
            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
500
            this.Column7.Width = 250;
517
            this.Column7.Width = 200;
501 518
            // 
502
            // Column15
503
            // 
504
            this.Column15.HeaderText = "貸出処理日";
505
            this.Column15.Name = "Column15";
506
            this.Column15.ReadOnly = true;
507
            this.Column15.Visible = false;
508
            // 
509 519
            // Column16
510 520
            // 
511 521
            this.Column16.HeaderText = "完了フラグ";
......
561 571
        private System.Windows.Forms.Label label5;
562 572
        private System.Windows.Forms.Label label7;
563 573
        private System.Windows.Forms.Label label6;
574
        private System.Windows.Forms.Label lblLabel01;
564 575
        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
565 576
        private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
566 577
        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
......
568 579
        private System.Windows.Forms.DataGridViewTextBoxColumn Column10;
569 580
        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
570 581
        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
582
        private System.Windows.Forms.DataGridViewTextBoxColumn Column18;
571 583
        private System.Windows.Forms.DataGridViewTextBoxColumn Column14;
572 584
        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
573 585
        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
......
576 588
        private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
577 589
        private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
578 590
        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
579
        private System.Windows.Forms.DataGridViewTextBoxColumn Column15;
580 591
        private System.Windows.Forms.DataGridViewTextBoxColumn Column16;
581
        private System.Windows.Forms.Label lblLabel01;
582 592
    }
583 593
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/FrmMaterialReturnEntry.resx
138 138
  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
139 139
    <value>True</value>
140 140
  </metadata>
141
  <metadata name="Column18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
142
    <value>True</value>
143
  </metadata>
141 144
  <metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
142 145
    <value>True</value>
143 146
  </metadata>
......
150 153
  <metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
151 154
    <value>True</value>
152 155
  </metadata>
153
  <metadata name="Column15.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
154
    <value>True</value>
155
  </metadata>
156 156
  <metadata name="Column16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
157 157
    <value>True</value>
158 158
  </metadata>
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/Material/FrmMaterialHistory.cs
19 19
using ProcessManagement.Forms.Master;
20 20
using ProcessManagement.Forms.CustomControls;
21 21
using ProcessManagement.Forms.ControlsAction;
22
//*------------------------ 単位マスタメンテ画面 ----------------------*
22
//*------------------------ 資材履歴表示画面 ----------------------------------*
23 23
//  2015/07/14  Ver1.0.0.0      Create Source           
24
//  2018/01/05  Ver2.0.0.0      画面変更
24 25
//
25 26
//
26
//
27 27
//*----------------------------------------------------------------------------*
28 28
namespace ProcessManagement.Forms.SubForms
29 29
{
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
32 32
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
33 33
// 既定値にすることができます:
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.1.25")]
36
[assembly: AssemblyFileVersion("1.0.1.25")]
35
[assembly: AssemblyVersion("1.0.1.26")]
36
[assembly: AssemblyFileVersion("1.0.1.26")]
37 37
// Log4netを使用する
38 38
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

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