개정판 b45e552e
issue #0000
excel import 오류 수정
- 유사도2 추가로 인한 오류 수정
- 예외 체크하여 오류 메세지 팝업되도록 수정
Change-Id: I490f946eead310e5eb465625cd81234d63a5cf44
| ID2.Manager/ID2.Manager.Common/Helpers/ID2Excel.cs | ||
|---|---|---|
| 227 | 227 |
break; |
| 228 | 228 |
case 17://유사도 |
| 229 | 229 |
break; |
| 230 |
case 18://난이도 |
|
| 230 |
case 18://유사도2 |
|
| 231 |
break; |
|
| 232 |
case 19://난이도 |
|
| 231 | 233 |
document.JobLevel = value; |
| 232 | 234 |
break; |
| 233 |
case 19:
|
|
| 235 |
case 20:
|
|
| 234 | 236 |
document.RevisonNo = value; |
| 235 | 237 |
break; |
| 236 |
case 20:
|
|
| 238 |
case 21:
|
|
| 237 | 239 |
document.ToIsDiscussion = value; |
| 238 | 240 |
break; |
| 239 |
case 21:
|
|
| 241 |
case 22:
|
|
| 240 | 242 |
document.ToRemarks = value; |
| 241 | 243 |
break; |
| 242 |
case 22:
|
|
| 244 |
case 23:
|
|
| 243 | 245 |
document.ToCreator = this.GetUser(value).ID; |
| 244 | 246 |
break; |
| 245 |
case 23:
|
|
| 247 |
case 24:
|
|
| 246 | 248 |
if (value != null) |
| 247 | 249 |
{
|
| 248 | 250 |
if (document.AttFiles == null) |
| ... | ... | |
| 268 | 270 |
document.ToCapture = ++toreview; |
| 269 | 271 |
} |
| 270 | 272 |
break; |
| 271 |
case 24:
|
|
| 273 |
case 25:
|
|
| 272 | 274 |
document.FrReviewStatus = value; |
| 273 | 275 |
break; |
| 274 |
case 25:
|
|
| 276 |
case 26:
|
|
| 275 | 277 |
document.FrRemarks = value; |
| 276 | 278 |
break; |
| 277 |
case 26:
|
|
| 279 |
case 27:
|
|
| 278 | 280 |
document.FrCreator = this.GetUser(value).ID; |
| 279 | 281 |
break; |
| 280 |
case 27:
|
|
| 282 |
case 28:
|
|
| 281 | 283 |
if (value != null) |
| 282 | 284 |
{
|
| 283 | 285 |
if (document.AttFiles == null) |
| ... | ... | |
| 303 | 305 |
document.FrCapture = ++frreview; |
| 304 | 306 |
} |
| 305 | 307 |
break; |
| 306 |
case 28:
|
|
| 308 |
case 29:
|
|
| 307 | 309 |
document.ID2StartDate = string.IsNullOrEmpty(value) ? (DateTime?)null : Convert.ToDateTime(value); |
| 308 | 310 |
break; |
| 309 |
case 29:
|
|
| 311 |
case 30:
|
|
| 310 | 312 |
document.ID2EndDate = string.IsNullOrEmpty(value) ? (DateTime?)null : Convert.ToDateTime(value); |
| 311 | 313 |
break; |
| 312 |
case 30:
|
|
| 314 |
case 31:
|
|
| 313 | 315 |
document.ID2Status = value; |
| 314 | 316 |
break; |
| 315 |
case 31:
|
|
| 317 |
case 32:
|
|
| 316 | 318 |
document.ID2Issues = value; |
| 317 | 319 |
break; |
| 318 |
case 32:
|
|
| 320 |
case 33:
|
|
| 319 | 321 |
if (value != null) |
| 320 | 322 |
{
|
| 321 | 323 |
if (document.AttFiles == null) |
| ... | ... | |
| 341 | 343 |
document.ID2Capture = ++id2work; |
| 342 | 344 |
} |
| 343 | 345 |
break; |
| 344 |
case 33:
|
|
| 346 |
case 34:
|
|
| 345 | 347 |
document.ReplyModifications = value; |
| 346 | 348 |
break; |
| 347 |
case 34:
|
|
| 349 |
case 35:
|
|
| 348 | 350 |
document.ReplyRequester = this.GetUser(value).ID; |
| 349 | 351 |
break; |
| 350 |
case 35:
|
|
| 352 |
case 36:
|
|
| 351 | 353 |
document.IsConvert = value; |
| 352 | 354 |
break; |
| 353 |
case 36:
|
|
| 355 |
case 37:
|
|
| 354 | 356 |
document.AVEVAConvertDate = string.IsNullOrEmpty(value) ? (DateTime?)null : Convert.ToDateTime(value); |
| 355 | 357 |
break; |
| 356 |
case 37:
|
|
| 358 |
case 38:
|
|
| 357 | 359 |
document.AVEVAWorkDate = string.IsNullOrEmpty(value) ? (DateTime?)null : Convert.ToDateTime(value); |
| 358 | 360 |
break; |
| 359 |
case 38:
|
|
| 361 |
case 39:
|
|
| 360 | 362 |
document.AVEVAStatus = value; |
| 361 | 363 |
break; |
| 362 |
case 39:
|
|
| 364 |
case 40:
|
|
| 363 | 365 |
document.AVEVAIssues = value; |
| 364 | 366 |
break; |
| 365 |
case 40:
|
|
| 367 |
case 41:
|
|
| 366 | 368 |
document.AVEVAReviewDate = string.IsNullOrEmpty(value) ? (DateTime?)null : Convert.ToDateTime(value); |
| 367 | 369 |
break; |
| 368 |
case 41:
|
|
| 370 |
case 42:
|
|
| 369 | 371 |
document.ProdReviewer = this.GetUser(value).ID; |
| 370 | 372 |
break; |
| 371 |
case 42:
|
|
| 373 |
case 43:
|
|
| 372 | 374 |
document.ProdIsResult = value; |
| 373 | 375 |
break; |
| 374 |
case 43:
|
|
| 376 |
case 44:
|
|
| 375 | 377 |
document.ProdRemarks = value; |
| 376 | 378 |
break; |
| 377 |
case 44:
|
|
| 379 |
case 45:
|
|
| 378 | 380 |
document.ClientReviewer = this.GetUser(value).ID; |
| 379 | 381 |
break; |
| 380 |
case 45:
|
|
| 382 |
case 46:
|
|
| 381 | 383 |
document.ClientIsResult = value; |
| 382 | 384 |
break; |
| 383 |
case 46:
|
|
| 385 |
case 47:
|
|
| 384 | 386 |
document.ClientRemarks = value; |
| 385 | 387 |
break; |
| 386 |
case 47:
|
|
| 388 |
case 48:
|
|
| 387 | 389 |
document.DTIsGateWay = value; |
| 388 | 390 |
break; |
| 389 |
case 48:
|
|
| 391 |
case 49:
|
|
| 390 | 392 |
document.DTIsImport = value; |
| 391 | 393 |
break; |
| 392 |
case 49:
|
|
| 394 |
case 50:
|
|
| 393 | 395 |
document.DTIsRegSystem = value; |
| 394 | 396 |
break; |
| 395 |
case 50:
|
|
| 397 |
case 51:
|
|
| 396 | 398 |
document.DTRemarks = value; |
| 397 | 399 |
break; |
| 398 | 400 |
} |
| ID2.Manager/ID2.Manager/Main.cs | ||
|---|---|---|
| 2908 | 2908 |
|
| 2909 | 2909 |
private void RadButtonElementExcelImport_Click(object sender, EventArgs e) |
| 2910 | 2910 |
{
|
| 2911 |
var form = new Forms.SelectExcelData(); |
|
| 2911 |
try |
|
| 2912 |
{
|
|
| 2913 |
var form = new Forms.SelectExcelData(); |
|
| 2912 | 2914 |
|
| 2913 |
var dialogResult = form.ShowDialog(); |
|
| 2915 |
var dialogResult = form.ShowDialog();
|
|
| 2914 | 2916 |
|
| 2915 |
if (dialogResult == DialogResult.OK) |
|
| 2916 |
{
|
|
| 2917 |
using (ID2Excel excel = new ID2Excel()) |
|
| 2917 |
if (dialogResult == DialogResult.OK) |
|
| 2918 | 2918 |
{
|
| 2919 |
var result = excel.ExcelDataImport(form.SelectItems); |
|
| 2920 |
|
|
| 2921 |
if (result.Error != null) |
|
| 2922 |
{
|
|
| 2923 |
RadMessageBox.Show(result.Error, Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Error); |
|
| 2924 |
} |
|
| 2925 |
else |
|
| 2919 |
using (ID2Excel excel = new ID2Excel()) |
|
| 2926 | 2920 |
{
|
| 2927 |
this.importImages = result.Images;//???
|
|
| 2921 |
var result = excel.ExcelDataImport(form.SelectItems);
|
|
| 2928 | 2922 |
|
| 2929 |
var intersections = this.documents.Intersect(result.documents, new DocumentsUniqueCompare()); |
|
| 2930 |
var subtractions = result.documents.Except(this.documents, new DocumentsUniqueCompare()); |
|
| 2931 |
|
|
| 2932 |
if (intersections.Any()) |
|
| 2923 |
if (result.Error != null) |
|
| 2933 | 2924 |
{
|
| 2934 |
var intersectionImports = result.documents.Intersect(this.documents, new DocumentsUniqueCompare()); |
|
| 2925 |
RadMessageBox.Show(result.Error, Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Error); |
|
| 2926 |
} |
|
| 2927 |
else |
|
| 2928 |
{
|
|
| 2929 |
this.importImages = result.Images;//??? |
|
| 2930 |
|
|
| 2931 |
var intersections = this.documents.Intersect(result.documents, new DocumentsUniqueCompare()); |
|
| 2932 |
var subtractions = result.documents.Except(this.documents, new DocumentsUniqueCompare()); |
|
| 2935 | 2933 |
|
| 2936 |
intersections.ForAll(x =>
|
|
| 2934 |
if (intersections.Any())
|
|
| 2937 | 2935 |
{
|
| 2938 |
var intersectionImport = intersectionImports.FirstOrDefault(o => o.RefProjectCode == x.RefProjectCode && o.DocumentNo == x.DocumentNo); |
|
| 2939 |
if (intersectionImport != null) |
|
| 2936 |
var intersectionImports = result.documents.Intersect(this.documents, new DocumentsUniqueCompare()); |
|
| 2937 |
|
|
| 2938 |
intersections.ForAll(x => |
|
| 2940 | 2939 |
{
|
| 2941 |
x.DataCopy(intersectionImport); |
|
| 2942 |
} |
|
| 2943 |
}); |
|
| 2944 |
} |
|
| 2940 |
var intersectionImport = intersectionImports.FirstOrDefault(o => o.RefProjectCode == x.RefProjectCode && o.DocumentNo == x.DocumentNo); |
|
| 2941 |
if (intersectionImport != null) |
|
| 2942 |
{
|
|
| 2943 |
x.DataCopy(intersectionImport); |
|
| 2944 |
} |
|
| 2945 |
}); |
|
| 2946 |
} |
|
| 2945 | 2947 |
|
| 2946 |
this.documents.AddRange(subtractions); |
|
| 2947 |
if (this.orgDocuments == null) this.orgDocuments = new List<Documents>(); |
|
| 2948 |
this.DocumentListBinding(false); |
|
| 2949 |
//briefAndImagesReview.SetImages(this.importImages); |
|
| 2948 |
this.documents.AddRange(subtractions);
|
|
| 2949 |
if (this.orgDocuments == null) this.orgDocuments = new List<Documents>();
|
|
| 2950 |
this.DocumentListBinding(false);
|
|
| 2951 |
//briefAndImagesReview.SetImages(this.importImages);
|
|
| 2950 | 2952 |
|
| 2951 |
RadMessageBox.Show("Import is complete", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
|
|
| 2952 |
} |
|
| 2953 |
RadMessageBox.Show("Import is complete", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
|
|
| 2954 |
}
|
|
| 2953 | 2955 |
|
| 2956 |
} |
|
| 2954 | 2957 |
} |
| 2955 | 2958 |
} |
| 2959 |
catch (Exception ex) |
|
| 2960 |
{
|
|
| 2961 |
Program.logger.Error($"An exception occurred from {MethodBase.GetCurrentMethod().Name}", ex);
|
|
| 2962 |
RadMessageBox.Show("DWG excel import failed.", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Error);
|
|
| 2963 |
} |
|
| 2956 | 2964 |
} |
| 2957 | 2965 |
|
| 2958 | 2966 |
private void RadButtonElementExcelImport_Click_gembox(object sender, EventArgs e) |
내보내기 Unified diff
