프로젝트

일반

사용자정보

개정판 ab3c1c74

IDab3c1c7495f7a37b62b90c2f95fd780b7e4955cf
상위 e1377864
하위 6e8704d8

유성호이(가) 일년 이상 전에 추가함

issue #0000
신규 관리항목
- AVEVA 작업일(AVEVAWorkDate)
- Main 리스트 컬럼 추가
- Model 및 DB 삭제
- crud 수정

Change-Id: Ia9b97df44e7cf458ff08ed12cb6ea6bb8b6f5390

차이점 보기:

ID2.Manager/ID2.Manager.Common/Helpers/ID2Excel.cs
279 279
                            case 31:
280 280
                                document.AVEVAReviewDate = string.IsNullOrEmpty(value) ? (DateTime?)null : Convert.ToDateTime(value);
281 281
                                break;
282
                            //case 31:추가필요
283
                            //    document.AVEVAWorkDate = string.IsNullOrEmpty(value) ? (DateTime?)null : Convert.ToDateTime(value);
284
                            //    break;
282 285
                            case 32:
283 286
                                document.AVEVAStatus = value;
284 287
                                break;
......
448 451
                                   //AVEVAConnection = ws.Rows[p.Index].Cells[5].IsNullOrEmpty() ? string.Empty : ws.Rows[p.Index].Cells[5].Value.ToString(),
449 452
                                   AVEVAConvertDate = ws.Rows[p.Index].Cells[29].IsNullOrEmpty() ? (DateTime?)null : Convert.ToDateTime(ws.Rows[p.Index].Cells[29].Value.ToString()),
450 453
                                   AVEVAReviewDate = ws.Rows[p.Index].Cells[30].IsNullOrEmpty() ? (DateTime?)null : Convert.ToDateTime(ws.Rows[p.Index].Cells[30].Value.ToString()),
454
                                   //AVEVAWorkDate 추가필요
451 455
                                   AVEVAStatus = ws.Rows[p.Index].Cells[31].IsNullOrEmpty() ? string.Empty : ws.Rows[p.Index].Cells[31].Value.ToString(),
452 456
                                   AVEVAIssues = ws.Rows[p.Index].Cells[32].IsNullOrEmpty() ? string.Empty : ws.Rows[p.Index].Cells[32].Value.ToString(),
453 457
                                   ProdReviewer = ws.Rows[p.Index].Cells[35].IsNullOrEmpty() ? string.Empty : this.GetUser(ws.Rows[p.Index].Cells[35].Value.ToString()).ID,
ID2.Manager/ID2.Manager.Controller/Controllers/DocumentController.cs
104 104
                                     AVEVAWorker = doc.AVEVAWorker,
105 105
                                     AVEVAConvertDate = doc.AVEVAConvertDate,
106 106
                                     AVEVAReviewDate = doc.AVEVAReviewDate,
107
                                     AVEVAWorkDate = doc.AVEVAWorkDate,
107 108
                                     AVEVAStatus = doc.AVEVAStatus,
108 109
                                     AVEVAIssues = doc.AVEVAIssues,
109 110
                                     ProdReviewer = doc.ProdReviewer,
ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs
386 386
    ,AVEVAWorker
387 387
    ,AVEVAConvertDate
388 388
    ,AVEVAReviewDate
389
    ,AVEVAWorkDate
389 390
    ,AVEVAStatus
390 391
    ,AVEVAIssues
391 392
    ,ProdReviewer
......
429 430
    ,@AVEVAWorker
430 431
    ,@AVEVAConvertDate
431 432
    ,@AVEVAReviewDate
433
    ,@AVEVAWorkDate
432 434
    ,@AVEVAStatus
433 435
    ,@AVEVAIssues
434 436
    ,@ProdReviewer
......
483 485
      ,AVEVAWorker=@AVEVAWorker
484 486
      ,AVEVAConvertDate=@AVEVAConvertDate
485 487
      ,AVEVAReviewDate=@AVEVAReviewDate
488
      ,AVEVAWorkDate=@AVEVAWorkDate
486 489
      ,AVEVAStatus=@AVEVAStatus
487 490
      ,AVEVAIssues=@AVEVAIssues
488 491
      ,ProdReviewer=@ProdReviewer
ID2.Manager/ID2.Manager.Data/Models/Documents.cs
120 120
        [DataMember]
121 121
        public DateTime? AVEVAReviewDate { get; set; }
122 122
        [DataMember]
123
        public DateTime? AVEVAWorkDate { get; set; }
124
        [DataMember]
123 125
        public string AVEVAStatus { get; set; }
124 126
        [DataMember]
125 127
        public string AVEVAIssues { get; set; }
......
180 182
                && this.FrReviewStatus == other.FrReviewStatus && this.FrRemarks == other.FrRemarks && this.FrCreator == other.FrCreator
181 183
                && this.ID2StartDate == other.ID2StartDate && this.ID2EndDate == other.ID2EndDate && this.ID2Status == other.ID2Status
182 184
                && this.ID2Issues == other.ID2Issues && this.ReplyModifications == other.ReplyModifications && this.ReplyRequester == other.ReplyRequester && this.IsConvert == other.IsConvert && this.AVEVAPersonInCharge == other.AVEVAPersonInCharge && this.AVEVAWorker == other.AVEVAWorker
183
                && this.AVEVAConvertDate == other.AVEVAConvertDate && this.AVEVAReviewDate == other.AVEVAReviewDate
185
                && this.AVEVAConvertDate == other.AVEVAConvertDate && this.AVEVAReviewDate == other.AVEVAReviewDate && this.AVEVAWorkDate == other.AVEVAWorkDate
184 186
                && this.AVEVAStatus == other.AVEVAStatus && this.AVEVAIssues == other.AVEVAIssues
185 187
                && this.ProdReviewer == other.ProdReviewer && this.ProdIsResult == other.ProdIsResult && this.ProdRemarks == other.ProdRemarks && this.ClientReviewer == other.ClientReviewer
186 188
                && this.ClientIsResult == other.ClientIsResult && this.ClientRemarks == other.ClientRemarks && this.DTIsGateWay == other.DTIsGateWay && this.DTIsImport == other.DTIsImport
......
205 207
                + this.FrReviewStatus.GetNullableHash() + this.FrRemarks.GetNullableHash() + this.FrCreator.GetNullableHash()
206 208
                + this.ID2StartDate.GetNullableHash() + this.ID2EndDate.GetNullableHash() + this.ID2Status.GetNullableHash()
207 209
                + this.ID2Issues.GetNullableHash() + this.ReplyModifications.GetNullableHash() + this.ReplyRequester.GetNullableHash() + this.IsConvert.GetNullableHash() + this.AVEVAPersonInCharge.GetNullableHash() + this.AVEVAWorker.GetNullableHash()
208
                + this.AVEVAConvertDate.GetNullableHash() + this.AVEVAReviewDate.GetNullableHash()
210
                + this.AVEVAConvertDate.GetNullableHash() + this.AVEVAReviewDate.GetNullableHash() + this.AVEVAWorkDate.GetNullableHash()
209 211
                + this.AVEVAStatus.GetNullableHash() + this.AVEVAIssues.GetNullableHash()
210 212
                + this.ProdReviewer.GetNullableHash() + this.ProdIsResult.GetNullableHash() + this.ProdRemarks.GetNullableHash() + this.ClientReviewer.GetNullableHash()
211 213
                + this.ClientIsResult.GetNullableHash() + this.ClientRemarks.GetNullableHash() + this.DTIsGateWay.GetNullableHash() + this.DTIsImport.GetNullableHash()
ID2.Manager/ID2.Manager/Main.Designer.cs
61 61
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn13 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
62 62
            Telerik.WinControls.UI.GridViewDateTimeColumn gridViewDateTimeColumn3 = new Telerik.WinControls.UI.GridViewDateTimeColumn();
63 63
            Telerik.WinControls.UI.GridViewDateTimeColumn gridViewDateTimeColumn4 = new Telerik.WinControls.UI.GridViewDateTimeColumn();
64
            Telerik.WinControls.UI.GridViewDateTimeColumn gridViewDateTimeColumn5 = new Telerik.WinControls.UI.GridViewDateTimeColumn();
64 65
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn14 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
65 66
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn9 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
66 67
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn15 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
......
478 479
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
479 480
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
480 481
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
481
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 90F));
482
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 91F));
482 483
            this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListFrReviewStatus, 4, 2);
483 484
            this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListToIsDiscussion, 2, 2);
484 485
            this.tableLayoutPanelCondition.Controls.Add(this.radLabelFrReviewStatus, 3, 2);
......
533 534
            this.radDropDownListFrReviewStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
534 535
            this.radDropDownListFrReviewStatus.DropDownAnimationEnabled = true;
535 536
            this.radDropDownListFrReviewStatus.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
536
            this.radDropDownListFrReviewStatus.Location = new System.Drawing.Point(356, 60);
537
            this.radDropDownListFrReviewStatus.Location = new System.Drawing.Point(355, 60);
537 538
            this.radDropDownListFrReviewStatus.Name = "radDropDownListFrReviewStatus";
538
            this.radDropDownListFrReviewStatus.Size = new System.Drawing.Size(117, 20);
539
            this.radDropDownListFrReviewStatus.Size = new System.Drawing.Size(116, 20);
539 540
            this.radDropDownListFrReviewStatus.TabIndex = 18;
540 541
            // 
541 542
            // radDropDownListToIsDiscussion
......
545 546
            this.radDropDownListToIsDiscussion.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
546 547
            this.radDropDownListToIsDiscussion.Location = new System.Drawing.Point(146, 60);
547 548
            this.radDropDownListToIsDiscussion.Name = "radDropDownListToIsDiscussion";
548
            this.radDropDownListToIsDiscussion.Size = new System.Drawing.Size(117, 20);
549
            this.radDropDownListToIsDiscussion.Size = new System.Drawing.Size(116, 20);
549 550
            this.radDropDownListToIsDiscussion.TabIndex = 17;
550 551
            // 
551 552
            // radLabelFrReviewStatus
552 553
            // 
553 554
            this.radLabelFrReviewStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
554 555
            this.radLabelFrReviewStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
555
            this.radLabelFrReviewStatus.Location = new System.Drawing.Point(270, 62);
556
            this.radLabelFrReviewStatus.Location = new System.Drawing.Point(269, 62);
556 557
            this.radLabelFrReviewStatus.Name = "radLabelFrReviewStatus";
557 558
            this.radLabelFrReviewStatus.Size = new System.Drawing.Size(59, 17);
558 559
            this.radLabelFrReviewStatus.TabIndex = 7;
......
582 583
            // 
583 584
            this.radLabelAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
584 585
            this.radLabelAVEVAStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
585
            this.radLabelAVEVAStatus.Location = new System.Drawing.Point(480, 90);
586
            this.radLabelAVEVAStatus.Location = new System.Drawing.Point(478, 90);
586 587
            this.radLabelAVEVAStatus.Name = "radLabelAVEVAStatus";
587 588
            this.radLabelAVEVAStatus.Size = new System.Drawing.Size(86, 17);
588 589
            this.radLabelAVEVAStatus.TabIndex = 8;
......
592 593
            // 
593 594
            this.radLabelJobLevel.Anchor = System.Windows.Forms.AnchorStyles.Left;
594 595
            this.radLabelJobLevel.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
595
            this.radLabelJobLevel.Location = new System.Drawing.Point(480, 34);
596
            this.radLabelJobLevel.Location = new System.Drawing.Point(478, 34);
596 597
            this.radLabelJobLevel.Name = "radLabelJobLevel";
597 598
            this.radLabelJobLevel.Size = new System.Drawing.Size(47, 17);
598 599
            this.radLabelJobLevel.TabIndex = 7;
......
643 644
            this.radButtonSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
644 645
            this.radButtonSearch.Cursor = System.Windows.Forms.Cursors.Default;
645 646
            this.radButtonSearch.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
646
            this.radButtonSearch.Location = new System.Drawing.Point(915, 32);
647
            this.radButtonSearch.Location = new System.Drawing.Point(913, 32);
647 648
            this.radButtonSearch.Name = "radButtonSearch";
648 649
            this.tableLayoutPanelCondition.SetRowSpan(this.radButtonSearch, 5);
649 650
            this.radButtonSearch.Size = new System.Drawing.Size(54, 138);
......
657 658
            this.radDropDownListProject.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
658 659
            this.radDropDownListProject.Location = new System.Drawing.Point(146, 32);
659 660
            this.radDropDownListProject.Name = "radDropDownListProject";
660
            this.radDropDownListProject.Size = new System.Drawing.Size(117, 20);
661
            this.radDropDownListProject.Size = new System.Drawing.Size(116, 20);
661 662
            this.radDropDownListProject.TabIndex = 7;
662 663
            // 
663 664
            // radLabelDocumentNo
664 665
            // 
665 666
            this.radLabelDocumentNo.Anchor = System.Windows.Forms.AnchorStyles.Left;
666 667
            this.radLabelDocumentNo.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
667
            this.radLabelDocumentNo.Location = new System.Drawing.Point(690, 34);
668
            this.radLabelDocumentNo.Location = new System.Drawing.Point(687, 34);
668 669
            this.radLabelDocumentNo.Name = "radLabelDocumentNo";
669 670
            this.radLabelDocumentNo.Size = new System.Drawing.Size(52, 17);
670 671
            this.radLabelDocumentNo.TabIndex = 6;
......
673 674
            // radTextBoxDocumentNo
674 675
            // 
675 676
            this.radTextBoxDocumentNo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
676
            this.radTextBoxDocumentNo.Location = new System.Drawing.Point(776, 32);
677
            this.radTextBoxDocumentNo.Location = new System.Drawing.Point(773, 32);
677 678
            this.radTextBoxDocumentNo.Name = "radTextBoxDocumentNo";
678
            this.radTextBoxDocumentNo.Size = new System.Drawing.Size(117, 20);
679
            this.radTextBoxDocumentNo.Size = new System.Drawing.Size(116, 20);
679 680
            this.radTextBoxDocumentNo.TabIndex = 8;
680 681
            // 
681 682
            // radLabelPersonInCharge
682 683
            // 
683 684
            this.radLabelPersonInCharge.Anchor = System.Windows.Forms.AnchorStyles.Left;
684 685
            this.radLabelPersonInCharge.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
685
            this.radLabelPersonInCharge.Location = new System.Drawing.Point(270, 34);
686
            this.radLabelPersonInCharge.Location = new System.Drawing.Point(269, 34);
686 687
            this.radLabelPersonInCharge.Name = "radLabelPersonInCharge";
687 688
            this.radLabelPersonInCharge.Size = new System.Drawing.Size(47, 17);
688 689
            this.radLabelPersonInCharge.TabIndex = 6;
......
693 694
            this.radDropDownListPersonInCharge.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
694 695
            this.radDropDownListPersonInCharge.DropDownAnimationEnabled = true;
695 696
            this.radDropDownListPersonInCharge.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
696
            this.radDropDownListPersonInCharge.Location = new System.Drawing.Point(356, 32);
697
            this.radDropDownListPersonInCharge.Location = new System.Drawing.Point(355, 32);
697 698
            this.radDropDownListPersonInCharge.Name = "radDropDownListPersonInCharge";
698
            this.radDropDownListPersonInCharge.Size = new System.Drawing.Size(117, 20);
699
            this.radDropDownListPersonInCharge.Size = new System.Drawing.Size(116, 20);
699 700
            this.radDropDownListPersonInCharge.TabIndex = 9;
700 701
            // 
701 702
            // radLabel1
......
713 714
            this.radDropDownListJobLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
714 715
            this.radDropDownListJobLevel.DropDownAnimationEnabled = true;
715 716
            this.radDropDownListJobLevel.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
716
            this.radDropDownListJobLevel.Location = new System.Drawing.Point(566, 32);
717
            this.radDropDownListJobLevel.Location = new System.Drawing.Point(564, 32);
717 718
            this.radDropDownListJobLevel.Name = "radDropDownListJobLevel";
718
            this.radDropDownListJobLevel.Size = new System.Drawing.Size(117, 20);
719
            this.radDropDownListJobLevel.Size = new System.Drawing.Size(116, 20);
719 720
            this.radDropDownListJobLevel.TabIndex = 11;
720 721
            // 
721 722
            // radLabelID2Status
......
732 733
            // 
733 734
            this.radLabel10.Anchor = System.Windows.Forms.AnchorStyles.Left;
734 735
            this.radLabel10.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
735
            this.radLabel10.Location = new System.Drawing.Point(270, 118);
736
            this.radLabel10.Location = new System.Drawing.Point(269, 118);
736 737
            this.radLabel10.Name = "radLabel10";
737 738
            this.radLabel10.Size = new System.Drawing.Size(61, 17);
738 739
            this.radLabel10.TabIndex = 9;
......
745 746
            this.radDropDownListID2Status.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
746 747
            this.radDropDownListID2Status.Location = new System.Drawing.Point(146, 88);
747 748
            this.radDropDownListID2Status.Name = "radDropDownListID2Status";
748
            this.radDropDownListID2Status.Size = new System.Drawing.Size(117, 20);
749
            this.radDropDownListID2Status.Size = new System.Drawing.Size(116, 20);
749 750
            this.radDropDownListID2Status.TabIndex = 13;
750 751
            // 
751 752
            // radDropDownListAVEVAStatus
......
753 754
            this.radDropDownListAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
754 755
            this.radDropDownListAVEVAStatus.DropDownAnimationEnabled = true;
755 756
            this.radDropDownListAVEVAStatus.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
756
            this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(566, 88);
757
            this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(564, 88);
757 758
            this.radDropDownListAVEVAStatus.Name = "radDropDownListAVEVAStatus";
758
            this.radDropDownListAVEVAStatus.Size = new System.Drawing.Size(117, 20);
759
            this.radDropDownListAVEVAStatus.Size = new System.Drawing.Size(116, 20);
759 760
            this.radDropDownListAVEVAStatus.TabIndex = 14;
760 761
            // 
761 762
            // radDropDownListProdIsResult
......
765 766
            this.radDropDownListProdIsResult.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
766 767
            this.radDropDownListProdIsResult.Location = new System.Drawing.Point(146, 116);
767 768
            this.radDropDownListProdIsResult.Name = "radDropDownListProdIsResult";
768
            this.radDropDownListProdIsResult.Size = new System.Drawing.Size(117, 20);
769
            this.radDropDownListProdIsResult.Size = new System.Drawing.Size(116, 20);
769 770
            this.radDropDownListProdIsResult.TabIndex = 15;
770 771
            // 
771 772
            // radDropDownListClientIsResult
......
773 774
            this.radDropDownListClientIsResult.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
774 775
            this.radDropDownListClientIsResult.DropDownAnimationEnabled = true;
775 776
            this.radDropDownListClientIsResult.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
776
            this.radDropDownListClientIsResult.Location = new System.Drawing.Point(356, 116);
777
            this.radDropDownListClientIsResult.Location = new System.Drawing.Point(355, 116);
777 778
            this.radDropDownListClientIsResult.Name = "radDropDownListClientIsResult";
778
            this.radDropDownListClientIsResult.Size = new System.Drawing.Size(117, 20);
779
            this.radDropDownListClientIsResult.Size = new System.Drawing.Size(116, 20);
779 780
            this.radDropDownListClientIsResult.TabIndex = 16;
780 781
            // 
781 782
            // radLabel6
......
792 793
            // 
793 794
            this.radLabel7.Anchor = System.Windows.Forms.AnchorStyles.Left;
794 795
            this.radLabel7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
795
            this.radLabel7.Location = new System.Drawing.Point(270, 148);
796
            this.radLabel7.Location = new System.Drawing.Point(269, 148);
796 797
            this.radLabel7.Name = "radLabel7";
797 798
            this.radLabel7.Size = new System.Drawing.Size(72, 17);
798 799
            this.radLabel7.TabIndex = 12;
......
815 816
            this.radDropDownListGateway.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
816 817
            this.radDropDownListGateway.Location = new System.Drawing.Point(146, 147);
817 818
            this.radDropDownListGateway.Name = "radDropDownListGateway";
818
            this.radDropDownListGateway.Size = new System.Drawing.Size(117, 20);
819
            this.radDropDownListGateway.Size = new System.Drawing.Size(116, 20);
819 820
            this.radDropDownListGateway.TabIndex = 19;
820 821
            // 
821 822
            // radDropDownListRegistration
......
823 824
            this.radDropDownListRegistration.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
824 825
            this.radDropDownListRegistration.DropDownAnimationEnabled = true;
825 826
            this.radDropDownListRegistration.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
826
            this.radDropDownListRegistration.Location = new System.Drawing.Point(356, 147);
827
            this.radDropDownListRegistration.Location = new System.Drawing.Point(355, 147);
827 828
            this.radDropDownListRegistration.Name = "radDropDownListRegistration";
828
            this.radDropDownListRegistration.Size = new System.Drawing.Size(117, 20);
829
            this.radDropDownListRegistration.Size = new System.Drawing.Size(116, 20);
829 830
            this.radDropDownListRegistration.TabIndex = 20;
830 831
            // 
831 832
            // radLabel8
......
917 918
            // 
918 919
            this.radLabelID2Issues.Anchor = System.Windows.Forms.AnchorStyles.Left;
919 920
            this.radLabelID2Issues.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
920
            this.radLabelID2Issues.Location = new System.Drawing.Point(270, 90);
921
            this.radLabelID2Issues.Location = new System.Drawing.Point(269, 90);
921 922
            this.radLabelID2Issues.Name = "radLabelID2Issues";
922 923
            this.radLabelID2Issues.Size = new System.Drawing.Size(59, 17);
923 924
            this.radLabelID2Issues.TabIndex = 23;
......
927 928
            // 
928 929
            this.radLabelAVEVAIssues.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
929 930
            this.radLabelAVEVAIssues.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
930
            this.radLabelAVEVAIssues.Location = new System.Drawing.Point(690, 90);
931
            this.radLabelAVEVAIssues.Location = new System.Drawing.Point(687, 90);
931 932
            this.radLabelAVEVAIssues.Name = "radLabelAVEVAIssues";
932 933
            this.radLabelAVEVAIssues.Size = new System.Drawing.Size(81, 17);
933 934
            this.radLabelAVEVAIssues.TabIndex = 24;
......
938 939
            this.radDropDownListID2Issues.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
939 940
            this.radDropDownListID2Issues.DropDownAnimationEnabled = true;
940 941
            this.radDropDownListID2Issues.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
941
            this.radDropDownListID2Issues.Location = new System.Drawing.Point(356, 88);
942
            this.radDropDownListID2Issues.Location = new System.Drawing.Point(355, 88);
942 943
            this.radDropDownListID2Issues.Name = "radDropDownListID2Issues";
943
            this.radDropDownListID2Issues.Size = new System.Drawing.Size(117, 20);
944
            this.radDropDownListID2Issues.Size = new System.Drawing.Size(116, 20);
944 945
            this.radDropDownListID2Issues.TabIndex = 25;
945 946
            // 
946 947
            // radDropDownListAVEVAIssues
......
948 949
            this.radDropDownListAVEVAIssues.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
949 950
            this.radDropDownListAVEVAIssues.DropDownAnimationEnabled = true;
950 951
            this.radDropDownListAVEVAIssues.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
951
            this.radDropDownListAVEVAIssues.Location = new System.Drawing.Point(776, 88);
952
            this.radDropDownListAVEVAIssues.Location = new System.Drawing.Point(773, 88);
952 953
            this.radDropDownListAVEVAIssues.Name = "radDropDownListAVEVAIssues";
953
            this.radDropDownListAVEVAIssues.Size = new System.Drawing.Size(117, 20);
954
            this.radDropDownListAVEVAIssues.Size = new System.Drawing.Size(116, 20);
954 955
            this.radDropDownListAVEVAIssues.TabIndex = 26;
955 956
            // 
956 957
            // tableLayoutPanelGroup
......
1255 1256
            gridViewDateTimeColumn4.Name = "AVEVAReviewDate";
1256 1257
            gridViewDateTimeColumn4.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
1257 1258
            gridViewDateTimeColumn4.Width = 70;
1259
            gridViewDateTimeColumn5.FieldName = "AVEVAWorkDate";
1260
            gridViewDateTimeColumn5.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
1261
            gridViewDateTimeColumn5.FormatString = "{0: yyyy/MM/dd}";
1262
            gridViewDateTimeColumn5.HeaderText = "작업일";
1263
            gridViewDateTimeColumn5.Name = "AVEVAWorkDate";
1264
            gridViewDateTimeColumn5.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
1265
            gridViewDateTimeColumn5.Width = 70;
1258 1266
            gridViewComboBoxColumn14.EnableExpressionEditor = false;
1259 1267
            gridViewComboBoxColumn14.FieldName = "AVEVAStatus";
1260 1268
            gridViewComboBoxColumn14.HeaderText = "Status";
......
1360 1368
            gridViewComboBoxColumn13,
1361 1369
            gridViewDateTimeColumn3,
1362 1370
            gridViewDateTimeColumn4,
1371
            gridViewDateTimeColumn5,
1363 1372
            gridViewComboBoxColumn14,
1364 1373
            gridViewTextBoxColumn9,
1365 1374
            gridViewComboBoxColumn15,
ID2.Manager/ID2.Manager/Main.cs
1787 1787
                               //AVEVAConnection = ws.Rows[p.Index].Cells[5].Value == null ? string.Empty : ws.Rows[p.Index].Cells[5].Value.ToString(),
1788 1788
                               AVEVAConvertDate = ws.Rows[p.Index].Cells[29].Value == null ? (DateTime?)null : Convert.ToDateTime(ws.Rows[p.Index].Cells[29].Value.ToString()),
1789 1789
                               AVEVAReviewDate = ws.Rows[p.Index].Cells[30].Value == null ? (DateTime?)null : Convert.ToDateTime(ws.Rows[p.Index].Cells[30].Value.ToString()),
1790
                               //추가필요 AVEVAWorkDate = ws.Rows[p.Index].Cells[30].Value == null ? (DateTime?)null : Convert.ToDateTime(ws.Rows[p.Index].Cells[30].Value.ToString()),
1790 1791
                               AVEVAStatus = ws.Rows[p.Index].Cells[31].Value == null ? string.Empty : ws.Rows[p.Index].Cells[31].Value.ToString(),
1791 1792
                               AVEVAIssues = ws.Rows[p.Index].Cells[32].Value == null ? string.Empty : ws.Rows[p.Index].Cells[32].Value.ToString(),
1792 1793
                               ProdReviewer = ws.Rows[p.Index].Cells[35].Value == null ? string.Empty : this.GetUser(ws.Rows[p.Index].Cells[35].Value.ToString()).ID,
......
1896 1897
                            //templateWorksheet.Cells[rowIndex, 28].Value = doc.AVEVAConnection;
1897 1898
                            templateWorksheet.Cells[rowIndex, 29].Value = $"{doc.AVEVAConvertDate:yyyy/MM/dd}";
1898 1899
                            templateWorksheet.Cells[rowIndex, 30].Value = $"{doc.AVEVAReviewDate:yyyy/MM/dd}";
1900
                            //추가필요templateWorksheet.Cells[rowIndex, 30].Value = $"{doc.AVEVAWorkDate:yyyy/MM/dd}";
1899 1901
                            templateWorksheet.Cells[rowIndex, 31].Value = doc.AVEVAStatus;
1900 1902
                            templateWorksheet.Cells[rowIndex, 32].Value = doc.AVEVAIssues;
1901 1903
                            //templateWorksheet.Cells[rowIndex, 33].Value = doc.DocumentNo;
......
2261 2263
            List<string> rvToColNames = new List<string>() { "ToIsDiscussion", "ToRemarks", "ToCreator", "ToCapture" };
2262 2264
            List<string> rvFrColNames = new List<string>() { "FrReviewStatus", "FrRemarks", "FrCreator", "FrCapture" };
2263 2265
            List<string> wkID2ColNames = new List<string>() { "ID2StartDate", "ID2EndDate", "ID2Status", "ID2Issues", "ReplyModifications", "ReplyRequester", "IsConvert" };
2264
            List<string> wkAVEVAColNames = new List<string>() { "AVEVAConvertDate", "AVEVAReviewDate", "AVEVAStatus", "AVEVAIssues" };
2266
            List<string> wkAVEVAColNames = new List<string>() { "AVEVAConvertDate", "AVEVAReviewDate", "AVEVAWorkDate", "AVEVAStatus", "AVEVAIssues" };
2265 2267
            List<string> valProdColNames = new List<string>() { "ProdReviewer", "ProdIsResult", "ProdRemarks", "ProdCapture" };
2266 2268
            List<string> valCntColNames = new List<string>() { "ClientReviewer", "ClientIsResult", "ClientRemarks", "ClientCapture" };
2267 2269
            List<string> dtColNames = new List<string>() { "DTIsGateWay", "DTIsImport", "DTIsRegSystem", "DTRemarks" };

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)