개정판 58dd9e89
Fix: 스탬의 COMPANY_NAME이 실제 회사 이름으로 대체도지 않는 오류 수정
Change-Id: Ief8011c7d7ce974f1881907911f45c8c446a7e98
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 158 | 158 |
} |
| 159 | 159 |
} |
| 160 | 160 |
|
| 161 |
/// <summary> |
|
| 162 |
/// FinalPDF를 수행 후 관련 메시지를 표시한다. |
|
| 163 |
/// </summary> |
|
| 164 |
/// <param name="sender"></param> |
|
| 165 |
/// <param name="e"></param> |
|
| 161 | 166 |
private void BaseClient_SetFinalPDFCompleted(object sender, SetFinalPDFCompletedEventArgs e) |
| 162 | 167 |
{
|
| 163 |
//Logger.sendResLog("SetFinalPDFCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
|
| 164 |
string errormsg = CommonLib.Common.GetAlertMessageString("SetFinalPDFError", "MSG", "최종 파일을 만드는데 문제가 발생하였습니다");
|
|
| 165 |
string successmsg = CommonLib.Common.GetAlertMessageString("SetFinalPDFSuccess", "MSG", "최종 파일 생성 중입니다. 문서관리시스템을 확인해주세요");
|
|
| 166 | 168 |
if (e.Error != null || e.Result.Status == FinalStatus.Error) |
| 167 | 169 |
{
|
| 170 |
string errormsg = CommonLib.Common.GetAlertMessageString("SetFinalPDFError", "MSG", $"최종 파일을 만드는데 문제가 발생하였습니다{System.Environment.NewLine}{e.Result.Exception}");
|
|
| 168 | 171 |
DialogMessage_Alert(errormsg, "안내"); |
| 169 | 172 |
} |
| 170 | 173 |
else |
| 171 | 174 |
{
|
| 175 |
string successmsg = CommonLib.Common.GetAlertMessageString("SetFinalPDFSuccess", "MSG", "최종 파일 생성 중입니다. 문서관리시스템을 확인해주세요");
|
|
| 172 | 176 |
DialogMessage_Alert(successmsg, "안내"); |
| 173 | 177 |
} |
| 174 | 178 |
} |
| ... | ... | |
| 729 | 733 |
|
| 730 | 734 |
foreach (var markupitem in pageItems) |
| 731 | 735 |
{
|
| 732 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", item.MarkupInfoID); |
|
| 736 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", item.MarkupInfoID, |
|
| 737 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
|
| 733 | 738 |
} |
| 734 | 739 |
} |
| 735 | 740 |
} |
| ... | ... | |
| 850 | 855 |
foreach (var markup in instance) |
| 851 | 856 |
{
|
| 852 | 857 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", |
| 853 |
item.MarkupInfoID, markup.ID,STAMP_Contents:App.SystemInfo.STAMP_CONTENTS); |
|
| 858 |
item.MarkupInfoID, markup.ID, STAMP_Contents:App.SystemInfo.STAMP_CONTENTS);
|
|
| 854 | 859 |
} |
| 855 | 860 |
} |
| 856 | 861 |
|
| ... | ... | |
| 870 | 875 |
foreach (var markup in instance) |
| 871 | 876 |
{
|
| 872 | 877 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", |
| 873 |
item.MarkupInfoID, markup.ID); |
|
| 878 |
item.MarkupInfoID, markup.ID, STAMP_Contents: App.SystemInfo.STAMP_CONTENTS);
|
|
| 874 | 879 |
} |
| 875 | 880 |
} |
| 876 | 881 |
|
| ... | ... | |
| 1041 | 1046 |
foreach (var markup in instance) |
| 1042 | 1047 |
{
|
| 1043 | 1048 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", |
| 1044 |
item.MarkupInfoID, markup.ID); |
|
| 1049 |
item.MarkupInfoID, markup.ID, STAMP_Contents: App.SystemInfo.STAMP_CONTENTS);
|
|
| 1045 | 1050 |
} |
| 1046 | 1051 |
} |
| 1047 | 1052 |
|
| ... | ... | |
| 1354 | 1359 |
foreach (var markupitem in markupItems) |
| 1355 | 1360 |
{
|
| 1356 | 1361 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", |
| 1357 |
item.MarkupInfoID, markupitem.ID); |
|
| 1362 |
item.MarkupInfoID, markupitem.ID, STAMP_Contents: App.SystemInfo.STAMP_CONTENTS);
|
|
| 1358 | 1363 |
} |
| 1359 | 1364 |
} |
| 1360 | 1365 |
else |
| ... | ... | |
| 1363 | 1368 |
|
| 1364 | 1369 |
foreach (var markupitem in markupItems) |
| 1365 | 1370 |
{
|
| 1366 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", item.MarkupInfoID); |
|
| 1371 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", item.MarkupInfoID, |
|
| 1372 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
|
| 1367 | 1373 |
} |
| 1368 | 1374 |
} |
| 1369 | 1375 |
} |
내보내기 Unified diff
