프로젝트

일반

사용자정보

개정판 31beca73

ID31beca73913328c0f08ae54b4c8bb7cbc8157968
상위 ee910e7f
하위 5a31e4bf, 7b1db8cc

semi 이(가) 약 5년 전에 추가함

Convert_DOC & Final_PDF 중간그리드 FULL

Change-Id: I84af0c3f526d0d1d025f0ff33df25f08ef13dd13

차이점 보기:

ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/FinalPDFViewModel.cs
1
using Markus.Message;
2
using Markus.Service.Extensions;
1
using Markus.Service.Extensions;
3 2
using Markus.Service.StationController.Data;
4 3
using Markus.Service.StationController.Behaviors;
5 4
using Markus.Service.StationController.Extensions;
......
24 23
using System.Windows.Controls;
25 24
using System.IO;
26 25
using Newtonsoft.Json;
26
using Markus.Service.Interface;
27 27

  
28 28
namespace Markus.Service.StationController.ViewModel
29 29
{
......
311 311
            }
312 312
        }
313 313

  
314
        public string _Document_URLFilter;
315
        public string Document_URLFilter
316
        {
317
            get
318
            {
319
                return _Document_URLFilter;
320
            }
321
            set
322
            {
323
                if (_Document_URLFilter != value)
324
                {
325
                    _Document_URLFilter = value;
326
                    OnPropertyChanged(() => Document_URLFilter);
327
                }
328
            }
329
        }
314 330

  
315 331
        public string _MarkupInfo_IDFilter;
316 332
        public string MarkupInfo_IDFilter
......
651 667

  
652 668
                    foreach (var coll in collection)
653 669
                    {
654
                        var items = entities.SELECT_FINAL_PDF_ITEM(coll.ConvertID, coll.ProjectNumber, null, null,null, null, null, null, null, null, null, null, null, null, null, null, null, null).ToList();
670
                        var items = entities.SELECT_FINAL_PDF_ITEM(coll.ConvertID, coll.ProjectNumber, null, null,null, null, null, null, null, null, null, null, null, null, null, null, null, null,
671
                            null).ToList();
655 672

  
656 673
                        foreach (var x in items)
657 674
                        {
658
                            var convertpath = GetSearchConvertPathAndMarkus(x.PROJECT_NO, x.DOCUMENT_ID);
675
                            var MarkusLink = "kcom://" + CreateMarkusParam(coll.ConvertID, coll.DocumentID, "doftech");
659 676

  
660 677
                            ConvertItem AddItem = new ConvertItem(x.ID, x.PROJECT_NO, x.STATUS, x.DOCUMENT_ID, x.MARKUPINFO_ID, x.DOCINFO_ID, x.DOCUMENT_NAME, x.DOCUMENT_NO, x.CREATE_USER_ID, x.REVISION, x.CURRENT_PAGE,
661
                                x.TOTAL_PAGE, x.EXCEPTION, x.GROUP_NO, x.CREATE_DATETIME, x.START_DATETIME, x.END_DATETIME, x.ORIGINAL_FILE, convertpath[0], convertpath[1], 0);
678
                                x.TOTAL_PAGE, x.EXCEPTION, x.GROUP_NO, x.CREATE_DATETIME, x.START_DATETIME, x.END_DATETIME, x.ORIGINAL_FILE, x.CONVERT_PATH, MarkusLink, 0);
662 679
                            Listitems.Add(AddItem);
663 680

  
664 681
                        }
......
692 709
                        _status = (int)SelectedStatus.Value;
693 710
                    }
694 711

  
695
                    //var items = entities.SELECT_FINAL_PDF_ITEM(ProjectNumberFilter, DocumentIDFilter, MarkupInfo_IDFilter, DOCINFO_IDFilter, Document_NameFilter, Document_NOFilter, CreateUser_IDFilter, _status
696
                    //    , SelectedCount.ValueMember, GROUP_NOFilter, REVISIONFilter, SelectedCreateTimeBegin, SelectedCreateTimeEnd, null, null, null, null).ToList();
697
                    //var items = entities.SELECT_FINAL_PDF_ITEM(null, null, null, null, null, null, null, _status
698
                    //    , SelectedCount.ValueMember, null, null, null, null, null, null, null, null)
699
                    //                     .ToList();
700 712

  
701
                    var items = entities.SELECT_FINAL_PDF_ITEM(null, null, null, null, null, null, null, null, _status, SelectedCount.ValueMember, null, null, null, null,
713
                    var items = entities.SELECT_FINAL_PDF_ITEM(null, null, null, null, null, null, null, null, _status, SelectedCount.ValueMember, null, null, null, null, null,
702 714
                        null, null, null, null).ToList();
703 715

  
704 716
                    List<ConvertItem> Listitems = new List<ConvertItem>();
705 717

  
706 718
                    foreach (var x in items)
707 719
                    {
708
                        var convertpath = GetSearchConvertPathAndMarkus(x.PROJECT_NO, x.DOCUMENT_ID);
720
                        var MarkusLink = "kcom://" + CreateMarkusParam(x.ID, x.DOCUMENT_ID, "doftech");
709 721

  
710 722
                        ConvertItem AddItem = new ConvertItem(x.ID, x.PROJECT_NO, _status, x.DOCUMENT_ID, x.MARKUPINFO_ID, x.DOCINFO_ID, x.DOCUMENT_NAME, x.DOCUMENT_NO, x.CREATE_USER_ID,
711 723
                            x.REVISION, x.CURRENT_PAGE, x.TOTAL_PAGE, x.EXCEPTION, x.GROUP_NO, x.CREATE_DATETIME, x.START_DATETIME, x.END_DATETIME
712
                         , x.ORIGINAL_FILE, convertpath[0], convertpath[1], 0);
724
                         , x.ORIGINAL_FILE, x.CONVERT_PATH, MarkusLink, 0);
713 725

  
714 726
                        Listitems.Add(AddItem);
715 727
                    }
......
813 825
                        Finish_CreateTime = SelectedCreateTimeEnd;
814 826
                    }
815 827

  
816
                    var items = entities.SELECT_FINAL_PDF_ITEM(null, ProjectNumberFilter, DocumentIDFilter, MarkupInfo_IDFilter, DOCINFO_IDFilter, Document_NOFilter, Document_NOFilter,
817
                        CreateUser_IDFilter, _status, SelectedCount.ValueMember, GROUP_NOFilter, REVISIONFilter, Start_CreateTime, Finish_CreateTime, null, null, null, null).ToList();
828
                    var items = entities.SELECT_FINAL_PDF_ITEM(null, ProjectNumberFilter, DocumentIDFilter, MarkupInfo_IDFilter, DOCINFO_IDFilter, Document_NameFilter, Document_NOFilter,
829
                        CreateUser_IDFilter, _status, SelectedCount.ValueMember, GROUP_NOFilter, REVISIONFilter, Start_CreateTime, Finish_CreateTime, null, null, null, null, Document_URLFilter).ToList();
818 830

  
819 831

  
820 832
                    List<ConvertItem> Listitems = new List<ConvertItem>();
821 833

  
822 834
                    foreach (var x in items)
823 835
                    {
824
                        var convertpath = GetSearchConvertPathAndMarkus(x.PROJECT_NO, x.DOCUMENT_ID);
836
                        var MarkusLink = "kcom://" + CreateMarkusParam(x.ID, x.DOCUMENT_ID, "doftech");
825 837

  
826 838
                        ConvertItem AddItem = new ConvertItem(x.ID, x.PROJECT_NO, _status, x.DOCUMENT_ID, x.MARKUPINFO_ID, x.DOCINFO_ID, x.DOCUMENT_NAME, x.DOCUMENT_NO, x.CREATE_USER_ID,
827 839
                            x.REVISION, x.CURRENT_PAGE, x.TOTAL_PAGE, x.EXCEPTION, x.GROUP_NO, x.CREATE_DATETIME, x.START_DATETIME, x.END_DATETIME
828
                         , x.ORIGINAL_FILE, convertpath[0], convertpath[1], 0);
840
                         , x.ORIGINAL_FILE, x.CONVERT_PATH, MarkusLink, 0);
829 841
                        Listitems.Add(AddItem);
830 842
                        //이거 없으면 collection.Insert(i, item); 할때 문제 생김
831 843
                    }
......
1122 1134
                using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
1123 1135
                {
1124 1136

  
1125
                    var items = entities.SELECT_FINAL_PDF_ITEM(SelectFilterConvert.ConvertID, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null); //프로시저 이용
1137
                    var items = entities.SELECT_FINAL_PDF_ITEM(SelectFilterConvert.ConvertID, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null); //프로시저 이용
1126 1138

  
1127 1139

  
1128 1140
                    foreach (var x in items)
1129 1141
                    {
1130
                        var convertpath = GetSearchConvertPathAndMarkus(x.PROJECT_NO, x.DOCUMENT_ID);
1142
                        var MarkusLink = "kcom://" + CreateMarkusParam(x.ID, x.DOCUMENT_ID, "doftech");
1131 1143

  
1132 1144
                        ConvertItem AddItem = new ConvertItem(x.ID, x.PROJECT_NO, x.STATUS, x.DOCUMENT_ID, x.MARKUPINFO_ID, x.DOCINFO_ID, x.DOCUMENT_NAME, x.DOCUMENT_NO, x.CREATE_USER_ID,
1133 1145
                            x.REVISION, x.CURRENT_PAGE, x.TOTAL_PAGE, x.EXCEPTION, x.GROUP_NO, x.CREATE_DATETIME, x.START_DATETIME, x.END_DATETIME
1134
                         , x.ORIGINAL_FILE, convertpath[0], convertpath[1], 0);
1146
                         , x.ORIGINAL_FILE, x.CONVERT_PATH, MarkusLink, 0);
1135 1147

  
1136 1148
                        RealConvertSource.Add(AddItem);
1137 1149

  
......
1153 1165
            {
1154 1166
                int result = 0;
1155 1167

  
1156
                var items = entities.SELECT_FINAL_PDF_ITEM(_ConvertItem.ConvertID, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null).ToList();
1168
                var items = entities.SELECT_FINAL_PDF_ITEM(_ConvertItem.ConvertID, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null).ToList();
1157 1169

  
1158 1170
                if (items.Count() > 0)
1159 1171
                {
......
1223 1235
                string result = "";
1224 1236

  
1225 1237
                var properties = entities.SELECT_FINAL_PDF_ITEM(null, ProjectNo, null, null, null, null, null, null, null, 1, null, null, null, null,
1226
                        null, null, null, null).ToList();
1238
                        null, null, null, null, null).ToList();
1227 1239

  
1228 1240

  
1229 1241
                if (properties.Count() > 0)

내보내기 Unified diff

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