canrd-outside / order-erp · Commits

Commit 663fba6e746ba47571be0a8fc7929a79fb496397

Authored by 谢茂盛
1 parent 7943a0b5
build: skipped

feat: 问题修复项 

1、1225问题项修复
Inline Side-by-side
Showing 1 changed file with 96 additions and 43 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @663fba6
... ... @@ -326,15 +326,23 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
326 326 }
327 327 if (StringUtils.isNotBlank(baseFields.getProductionDepartmentConsignTime()) &&
328 328 OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProductionDepartmentConsignTime())) {
329   - map.put("生产科拖货时间", StringUtils.isBlank(orderInfoResultVO.getProductionDepartmentConsignTime()) ?
330   - orderInfoResultVO.getProductionDepartmentConsignTime() :
331   - DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getProductionDepartmentConsignTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  329 + try {
  330 + map.put("生产科拖货时间", StringUtils.isBlank(orderInfoResultVO.getProductionDepartmentConsignTime()) ?
  331 + orderInfoResultVO.getProductionDepartmentConsignTime() :
  332 + DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getProductionDepartmentConsignTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  333 + } catch (Exception e) {
  334 + map.put("生产科拖货时间", orderInfoResultVO.getProductionDepartmentConsignTime());
  335 + }
332 336 }
333 337 if (StringUtils.isNotBlank(baseFields.getOrderHodTime()) &&
334 338 OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOrderHodTime())) {
335   - map.put("订单上HOD时间", StringUtils.isBlank(orderInfoResultVO.getOrderHodTime()) ?
336   - orderInfoResultVO.getOrderHodTime() :
337   - DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getOrderHodTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  339 + try {
  340 + map.put("订单上HOD时间", StringUtils.isBlank(orderInfoResultVO.getOrderHodTime()) ?
  341 + orderInfoResultVO.getOrderHodTime() :
  342 + DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getOrderHodTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  343 + } catch (Exception e) {
  344 + map.put("订单上HOD时间", orderInfoResultVO.getOrderHodTime());
  345 + }
338 346 }
339 347 if (StringUtils.isNotBlank(baseFields.getOutboundType()) &&
340 348 OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOutboundType())) {
... ... @@ -423,9 +431,13 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
423 431 if (Objects.nonNull(trackStageFields) && Objects.nonNull(trackStageInfo)) {
424 432 if (StringUtils.isNotBlank(trackStageFields.getPpTime()) &&
425 433 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getPpTime())) {
426   - map.put("pp date", StringUtils.isBlank(trackStageInfo.getPpTime()) ?
427   - trackStageInfo.getPpTime() :
428   - DateUtils.format(DateUtils.parseDate(trackStageInfo.getPpTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  434 + try {
  435 + map.put("pp date", StringUtils.isBlank(trackStageInfo.getPpTime()) ?
  436 + trackStageInfo.getPpTime() :
  437 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getPpTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  438 + } catch (Exception e) {
  439 + map.put("pp date", trackStageInfo.getPpTime());
  440 + }
429 441 }
430 442 if (StringUtils.isNotBlank(trackStageFields.getPpConfirmResult()) &&
431 443 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getPpConfirmResult())) {
... ... @@ -433,15 +445,25 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
433 445 }
434 446 if (StringUtils.isNotBlank(trackStageFields.getEsoSampleSendTime()) &&
435 447 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getEsoSampleSendTime())) {
436   - map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", StringUtils.isBlank(trackStageInfo.getEsoSampleSendTime()) ?
437   - trackStageInfo.getEsoSampleSendTime() :
438   - DateUtils.format(DateUtils.parseDate(trackStageInfo.getEsoSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  448 + try {
  449 + map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", StringUtils.isBlank(trackStageInfo.getEsoSampleSendTime()) ?
  450 + trackStageInfo.getEsoSampleSendTime() :
  451 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getEsoSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  452 + } catch (Exception e) {
  453 + map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", trackStageInfo.getEsoSampleSendTime());
  454 + }
439 455 }
440 456 if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleSendTime()) &&
441 457 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getShippmentSampleSendTime())) {
442   - map.put("shippment sample 发送时间", StringUtils.isBlank(trackStageInfo.getShippmentSampleSendTime()) ?
443   - trackStageInfo.getShippmentSampleSendTime() :
444   - DateUtils.format(DateUtils.parseDate(trackStageInfo.getShippmentSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  458 + try {
  459 + map.put("shippment sample 发送时间", StringUtils.isBlank(trackStageInfo.getShippmentSampleSendTime()) ?
  460 + trackStageInfo.getShippmentSampleSendTime() :
  461 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getShippmentSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  462 +
  463 + } catch (Exception e) {
  464 + map.put("shippment sample 发送时间", trackStageInfo.getShippmentSampleSendTime());
  465 +
  466 + }
445 467 }
446 468 if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleConfirmResult()) &&
447 469 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getShippmentSampleConfirmResult())) {
... ... @@ -449,27 +471,37 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
449 471 }
450 472 if (StringUtils.isNotBlank(trackStageFields.getSelfTestPassTime()) &&
451 473 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSelfTestPassTime())) {
452   - map.put("自测通过时间", StringUtils.isBlank(trackStageInfo.getSelfTestPassTime()) ?
453   - trackStageInfo.getSelfTestPassTime() :
454   - DateUtils.format(DateUtils.parseDate(trackStageInfo.getSelfTestPassTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  474 + try {
  475 + map.put("自测通过时间", StringUtils.isBlank(trackStageInfo.getSelfTestPassTime()) ?
  476 + trackStageInfo.getSelfTestPassTime() :
  477 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getSelfTestPassTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  478 + } catch (Exception e) {
  479 + map.put("自测通过时间", trackStageInfo.getSelfTestPassTime());
  480 + }
455 481 }
456 482 if (StringUtils.isNotBlank(trackStageFields.getAitexTestSendTime()) &&
457 483 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getAitexTestSendTime())) {
458   - map.put("Aitex测试发送时间", StringUtils.isBlank(trackStageInfo.getAitexTestSendTime()) ?
459   - trackStageInfo.getAitexTestSendTime() :
460   - DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  484 + try {
  485 + map.put("Aitex测试发送时间", StringUtils.isBlank(trackStageInfo.getAitexTestSendTime()) ?
  486 + trackStageInfo.getAitexTestSendTime() :
  487 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  488 + } catch (Exception e) {
  489 + map.put("Aitex测试发送时间", trackStageInfo.getAitexTestSendTime());
  490 + }
461 491 }
462 492 if (StringUtils.isNotBlank(trackStageFields.getAitexTestFinishResult()) &&
463 493 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getAitexTestFinishResult())) {
464   - map.put("Aitex测试结果", StringUtils.isBlank(trackStageInfo.getAitexTestFinishResult()) ?
465   - trackStageInfo.getAitexTestFinishResult() :
466   - DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  494 + map.put("Aitex测试结果", trackStageInfo.getAitexTestFinishResult());
467 495 }
468 496 if (StringUtils.isNotBlank(trackStageFields.getSgsTestSendTime()) &&
469 497 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestSendTime())) {
470   - map.put("SGS测试发送时间", StringUtils.isBlank(trackStageInfo.getSgsTestSendTime()) ?
471   - trackStageInfo.getSgsTestSendTime() :
472   - DateUtils.format(DateUtils.parseDate(trackStageInfo.getSgsTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  498 + try {
  499 + map.put("SGS测试发送时间", StringUtils.isBlank(trackStageInfo.getSgsTestSendTime()) ?
  500 + trackStageInfo.getSgsTestSendTime() :
  501 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getSgsTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  502 + } catch (Exception e) {
  503 + map.put("SGS测试发送时间", trackStageInfo.getSgsTestSendTime());
  504 + }
473 505 }
474 506 if (StringUtils.isNotBlank(trackStageFields.getSgsTestFinishResult()) &&
475 507 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestFinishResult())) {
... ... @@ -477,21 +509,34 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
477 509 }
478 510 if (StringUtils.isNotBlank(trackStageFields.getBarcodeStickerArrivalTime()) &&
479 511 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getBarcodeStickerArrivalTime())) {
480   - map.put("Barcode sticker arrival time", StringUtils.isBlank(trackStageInfo.getBarcodeStickerArrivalTime()) ?
481   - trackStageInfo.getBarcodeStickerArrivalTime() :
482   - DateUtils.format(DateUtils.parseDate(trackStageInfo.getBarcodeStickerArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  512 + try {
  513 + map.put("Barcode sticker arrival time", StringUtils.isBlank(trackStageInfo.getBarcodeStickerArrivalTime()) ?
  514 + trackStageInfo.getBarcodeStickerArrivalTime() :
  515 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getBarcodeStickerArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  516 + } catch (Exception e) {
  517 + map.put("Barcode sticker arrival time", trackStageInfo.getBarcodeStickerArrivalTime());
  518 + }
483 519 }
484 520 if (StringUtils.isNotBlank(trackStageFields.getLatestArrivalTime()) &&
485 521 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getLatestArrivalTime())) {
486   - map.put("最晚包材到货时间", StringUtils.isBlank(trackStageInfo.getLatestArrivalTime()) ?
487   - trackStageInfo.getLatestArrivalTime() :
488   - DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  522 + try {
  523 + map.put("最晚包材到货时间", StringUtils.isBlank(trackStageInfo.getLatestArrivalTime()) ?
  524 + trackStageInfo.getLatestArrivalTime() :
  525 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  526 + } catch (Exception e) {
  527 + map.put("最晚包材到货时间", trackStageInfo.getLatestArrivalTime());
  528 + }
489 529 }
490 530 if (StringUtils.isNotBlank(trackStageFields.getLatestBkTime()) &&
491 531 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getLatestBkTime())) {
492   - map.put("最晚订舱+报关资料时间", StringUtils.isBlank(trackStageInfo.getLatestBkTime()) ?
493   - trackStageInfo.getLatestBkTime() :
494   - DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestBkTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  532 + try {
  533 + map.put("最晚订舱+报关资料时间", StringUtils.isBlank(trackStageInfo.getLatestBkTime()) ?
  534 + trackStageInfo.getLatestBkTime() :
  535 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestBkTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  536 + } catch (Exception e) {
  537 + map.put("最晚订舱+报关资料时间", trackStageInfo.getLatestBkTime());
  538 +
  539 + }
495 540 }
496 541 }
497 542 OrderInspectionStageVO inspectionStageInfo = Objects.nonNull(orderInfoResultVO.getInspectionStageInfo()) ?
... ... @@ -499,9 +544,13 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
499 544 if (Objects.nonNull(inspectionStageFields) && Objects.nonNull(inspectionStageInfo)) {
500 545 if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckApplyTime()) &&
501 546 OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckApplyTime())) {
502   - map.put("中期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getMidCheckApplyTime()) ?
503   - inspectionStageInfo.getMidCheckApplyTime() :
504   - DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getMidCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  547 + try {
  548 + map.put("中期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getMidCheckApplyTime()) ?
  549 + inspectionStageInfo.getMidCheckApplyTime() :
  550 + DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getMidCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  551 + } catch (Exception e) {
  552 + map.put("中期验货申请时间", inspectionStageInfo.getMidCheckApplyTime());
  553 + }
505 554 }
506 555 if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckComment()) &&
507 556 OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckComment())) {
... ... @@ -513,9 +562,13 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
513 562 }
514 563 if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckApplyTime()) &&
515 564 OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getEndCheckApplyTime())) {
516   - map.put("尾期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getEndCheckApplyTime()) ?
517   - inspectionStageInfo.getEndCheckApplyTime() :
518   - DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getEndCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  565 + try {
  566 + map.put("尾期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getEndCheckApplyTime()) ?
  567 + inspectionStageInfo.getEndCheckApplyTime() :
  568 + DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getEndCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  569 + } catch (Exception e) {
  570 + map.put("尾期验货申请时间", inspectionStageInfo.getEndCheckApplyTime());
  571 + }
519 572 }
520 573 if (StringUtils.isNotBlank(inspectionStageFields.getSpecification()) &&
521 574 OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getSpecification())) {
... ... @@ -860,7 +913,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
860 913 }
861 914 if (StringUtils.isBlank(inspectionStageInfo.getEndCheckResult())) {
862 915 return false;
863   - } else if ("FAIL".equals(inspectionStageInfo.getEndCheckResult())) {
  916 + } else if ("FAIL" .equals(inspectionStageInfo.getEndCheckResult())) {
864 917 return false;
865 918 }
866 919 return true;
... ...