개정판 919dee1b
Merged 완료
ConvertService/ServiceController/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs | ||
---|---|---|
626 | 626 |
|
627 | 627 |
if (!App.IsDesignMode) |
628 | 628 |
{ |
629 |
|
|
630 |
|
|
629 | 631 |
WcfClient = new DataService.DataServiceClient(); |
630 | 632 |
dispatcherTimer = new DispatcherTimer(); |
631 | 633 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick); |
... | ... | |
783 | 785 |
ProjectName Clear = new ProjectName("Selected All", "Selected All"); |
784 | 786 |
ProjectNames.Add(Clear); |
785 | 787 |
|
786 |
foreach (var x in await WcfClient.GET_SELECT_RUN_PROJECTSAsync(0)) |
|
788 |
var projectList = await WcfClient.GET_SELECT_RUN_PROJECTSAsync(0); |
|
789 |
|
|
790 |
foreach (var x in projectList) |
|
787 | 791 |
{ |
788 | 792 |
ProjectName projectName = new ProjectName(x.PROJECT_NO, x.PROJECT_NAME); |
789 | 793 |
ProjectNames.Add(projectName); |
... | ... | |
925 | 929 |
|
926 | 930 |
if (Listitems.Count(x => x.ConvertID == item.ConvertID && x.ProjectNumber == item.ProjectNumber) == 0) |
927 | 931 |
{ |
928 |
collection.RemoveAt(i);
|
|
932 |
collection.RemoveAt(i); |
|
929 | 933 |
} |
930 | 934 |
} |
931 | 935 |
} |
... | ... | |
995 | 999 |
|
996 | 1000 |
var MarkusLink = "kcom://" + CreateMarkusParam(item.ProjectNumber, item.DocumentID, "doftech"); |
997 | 1001 |
|
998 |
itemsToEach.ConvertState = (StatusCodeType)Enum.Parse(typeof(StatusCodeType), item.ConvertState.ToString()); |
|
1002 |
if (item.ConvertState != null) |
|
1003 |
{ |
|
1004 |
itemsToEach.ConvertState = (StatusCodeType)Enum.Parse(typeof(StatusCodeType), item.ConvertState); |
|
1005 |
} |
|
999 | 1006 |
|
1000 | 1007 |
if (item.OriginfilePath.Contains("/")) |
1001 | 1008 |
{ |
... | ... | |
1014 | 1021 |
itemsToEach.MarkusLink = MarkusLink; |
1015 | 1022 |
itemsToEach.UniqueKey = item.UniqueKey; |
1016 | 1023 |
itemsToEach.GroupNo = item.GroupNo; |
1017 |
itemsToEach.DocumentName = item.DocumentName;
|
|
1024 |
itemsToEach.DocumentName = item.DocumnetName;
|
|
1018 | 1025 |
itemsToEach.Revision = item.Revision; |
1019 | 1026 |
itemsToEach.Exception = item.Exception; |
1020 | 1027 |
itemsToEach.ConvertPath = item.ConvertPath; |
내보내기 Unified diff