canrd-outside / order-erp · Commits

Commit ec4074f54e16aec5c974f5ee7858a4afc40937a4

Authored by 谢茂盛
1 parent 91b15549
build: skipped

feat: 问题修复项 

1、1225问题项修复
Inline Side-by-side
Showing 1 changed file with 54 additions and 26 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @ec4074f
... ... @@ -18,6 +18,7 @@ import com.order.erp.common.constant.ServerResult;
18 18 import com.order.erp.common.constant.ServerResultCode;
19 19 import com.order.erp.common.excel4j.exceptions.Excel4JException;
20 20 import com.order.erp.common.exception.BusinessException;
  21 +import com.order.erp.common.utils.DateUtils;
21 22 import com.order.erp.common.utils.FileUtil;
22 23 import com.order.erp.common.utils.OrderFieldUtils;
23 24 import com.order.erp.common.utils.ProfitUtils;
... ... @@ -293,6 +294,16 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
293 294 OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getPoColor())) {
294 295 map.put("PO COLOR", orderInfoResultVO.getPoColor());
295 296 }
  297 + if (StringUtils.isNotBlank(baseFields.getPicUrl()) &&
  298 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getPicUrl())) {
  299 + if (StringUtils.isNotBlank(orderInfoResultVO.getSmallPicUrl())) {
  300 + URL url = new URL(orderInfoResultVO.getSmallPicUrl());
  301 + InputStream inputStream = url.openStream();
  302 + map.put("订单图片", FileUtil.imageParseBytes(inputStream));
  303 + } else {
  304 + map.put("订单图片", "");
  305 + }
  306 + }
296 307 if (StringUtils.isNotBlank(baseFields.getCnColor()) &&
297 308 OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getCnColor())) {
298 309 map.put("颜色中文", orderInfoResultVO.getCnColor());
... ... @@ -315,11 +326,15 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
315 326 }
316 327 if (StringUtils.isNotBlank(baseFields.getProductionDepartmentConsignTime()) &&
317 328 OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProductionDepartmentConsignTime())) {
318   - map.put("生成科拖货时间", orderInfoResultVO.getProductionDepartmentConsignTime());
  329 + map.put("生产科拖货时间", StringUtils.isBlank(orderInfoResultVO.getProductionDepartmentConsignTime()) ?
  330 + orderInfoResultVO.getProductionDepartmentConsignTime() :
  331 + DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getProductionDepartmentConsignTime(), DateUtils.DATE_TIME), DateUtils.DATE));
319 332 }
320 333 if (StringUtils.isNotBlank(baseFields.getOrderHodTime()) &&
321 334 OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOrderHodTime())) {
322   - map.put("订单上HOD时间", orderInfoResultVO.getOrderHodTime());
  335 + map.put("订单上HOD时间", StringUtils.isBlank(orderInfoResultVO.getOrderHodTime()) ?
  336 + orderInfoResultVO.getOrderHodTime() :
  337 + DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getOrderHodTime(), DateUtils.DATE_TIME), DateUtils.DATE));
323 338 }
324 339 if (StringUtils.isNotBlank(baseFields.getOutboundType()) &&
325 340 OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOutboundType())) {
... ... @@ -329,16 +344,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
329 344 OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getPacketType())) {
330 345 map.put("包装类型", orderInfoResultVO.getPacketType());
331 346 }
332   - if (StringUtils.isNotBlank(baseFields.getPicUrl()) &&
333   - OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getPicUrl())) {
334   - if (StringUtils.isNotBlank(orderInfoResultVO.getSmallPicUrl())) {
335   - URL url = new URL(orderInfoResultVO.getSmallPicUrl());
336   - InputStream inputStream = url.openStream();
337   - map.put("订单图片", FileUtil.imageParseBytes(inputStream));
338   - } else {
339   - map.put("订单图片", "");
340   - }
341   - }
342 347 }
343 348 OrderProfitAnalysisVO profitAnalysisVO = Objects.nonNull(orderInfoResultVO.getProfitAnalysisInfo()) ?
344 349 orderInfoResultVO.getProfitAnalysisInfo() : new OrderProfitAnalysisVO();
... ... @@ -361,11 +366,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
361 366 }
362 367 if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentPrice()) &&
363 368 OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getProductionDepartmentPrice())) {
364   - map.put("生成科单价￥", profitAnalysisVO.getProductionDepartmentPrice());
  369 + map.put("生产科单价￥", profitAnalysisVO.getProductionDepartmentPrice());
365 370 }
366 371 if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentTotalPrice()) &&
367 372 OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getProductionDepartmentTotalPrice())) {
368   - map.put("生成科总价￥", profitAnalysisVO.getProductionDepartmentTotalPrice());
  373 + map.put("生产科总价￥", profitAnalysisVO.getProductionDepartmentTotalPrice());
369 374 }
370 375 if (StringUtils.isNotBlank(profitAnalysisFields.getPacketPrice()) &&
371 376 OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getPacketPrice())) {
... ... @@ -418,7 +423,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
418 423 if (Objects.nonNull(trackStageFields) && Objects.nonNull(trackStageInfo)) {
419 424 if (StringUtils.isNotBlank(trackStageFields.getPpTime()) &&
420 425 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getPpTime())) {
421   - map.put("pp date", trackStageInfo.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));
422 429 }
423 430 if (StringUtils.isNotBlank(trackStageFields.getPpConfirmResult()) &&
424 431 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getPpConfirmResult())) {
... ... @@ -426,11 +433,15 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
426 433 }
427 434 if (StringUtils.isNotBlank(trackStageFields.getEsoSampleSendTime()) &&
428 435 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getEsoSampleSendTime())) {
429   - map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", trackStageInfo.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));
430 439 }
431 440 if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleSendTime()) &&
432 441 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getShippmentSampleSendTime())) {
433   - map.put("shippment sample 发送时间", trackStageInfo.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));
434 445 }
435 446 if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleConfirmResult()) &&
436 447 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getShippmentSampleConfirmResult())) {
... ... @@ -438,15 +449,22 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
438 449 }
439 450 if (StringUtils.isNotBlank(trackStageFields.getSelfTestPassTime()) &&
440 451 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSelfTestPassTime())) {
441   - map.put("自测通过时间", trackStageInfo.getSelfTestPassTime());
  452 + map.put("自测通过时间", StringUtils.isBlank(trackStageInfo.getSelfTestPassTime()) ?
  453 + trackStageInfo.getSelfTestPassTime() :
  454 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getSelfTestPassTime(), DateUtils.DATE_TIME), DateUtils.DATE));
442 455 }
443 456 if (StringUtils.isNotBlank(trackStageFields.getAitexTestSendTime()) &&
444 457 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getAitexTestSendTime())) {
445   - map.put("Aitex测试发送时间", trackStageInfo.getAitexTestSendTime());
  458 + map.put("Aitex测试发送时间", StringUtils.isBlank(trackStageInfo.getAitexTestSendTime()) ?
  459 + trackStageInfo.getAitexTestSendTime() :
  460 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
  461 +
446 462 }
447 463 if (StringUtils.isNotBlank(trackStageFields.getSgsTestSendTime()) &&
448 464 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestSendTime())) {
449   - map.put("SGS测试发送时间", trackStageInfo.getSgsTestSendTime());
  465 + map.put("SGS测试发送时间", StringUtils.isBlank(trackStageInfo.getSgsTestSendTime()) ?
  466 + trackStageInfo.getSgsTestSendTime() :
  467 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getSgsTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
450 468 }
451 469 if (StringUtils.isNotBlank(trackStageFields.getSgsTestFinishResult()) &&
452 470 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestFinishResult())) {
... ... @@ -454,15 +472,21 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
454 472 }
455 473 if (StringUtils.isNotBlank(trackStageFields.getBarcodeStickerArrivalTime()) &&
456 474 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getBarcodeStickerArrivalTime())) {
457   - map.put("Barcode sticker arrival time", trackStageInfo.getBarcodeStickerArrivalTime());
  475 + map.put("Barcode sticker arrival time", StringUtils.isBlank(trackStageInfo.getBarcodeStickerArrivalTime()) ?
  476 + trackStageInfo.getBarcodeStickerArrivalTime() :
  477 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getBarcodeStickerArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
458 478 }
459 479 if (StringUtils.isNotBlank(trackStageFields.getLatestArrivalTime()) &&
460 480 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getLatestArrivalTime())) {
461   - map.put("最晚包材到货时间", trackStageInfo.getLatestArrivalTime());
  481 + map.put("最晚包材到货时间", StringUtils.isBlank(trackStageInfo.getLatestArrivalTime()) ?
  482 + trackStageInfo.getLatestArrivalTime() :
  483 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
462 484 }
463 485 if (StringUtils.isNotBlank(trackStageFields.getLatestBkTime()) &&
464 486 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getLatestBkTime())) {
465   - map.put("最晚订舱+报关资料时间", trackStageInfo.getLatestBkTime());
  487 + map.put("最晚订舱+报关资料时间", StringUtils.isBlank(trackStageInfo.getLatestBkTime()) ?
  488 + trackStageInfo.getLatestBkTime() :
  489 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestBkTime(), DateUtils.DATE_TIME), DateUtils.DATE));
466 490 }
467 491 }
468 492 OrderInspectionStageVO inspectionStageInfo = Objects.nonNull(orderInfoResultVO.getInspectionStageInfo()) ?
... ... @@ -470,7 +494,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
470 494 if (Objects.nonNull(inspectionStageFields) && Objects.nonNull(inspectionStageInfo)) {
471 495 if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckApplyTime()) &&
472 496 OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckApplyTime())) {
473   - map.put("中期验货申请时间", inspectionStageInfo.getMidCheckApplyTime());
  497 + map.put("中期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getMidCheckApplyTime()) ?
  498 + inspectionStageInfo.getMidCheckApplyTime() :
  499 + DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getMidCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
474 500 }
475 501 if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckComment()) &&
476 502 OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckComment())) {
... ... @@ -482,7 +508,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
482 508 }
483 509 if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckApplyTime()) &&
484 510 OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getEndCheckApplyTime())) {
485   - map.put("尾期验货申请时间", inspectionStageInfo.getEndCheckApplyTime());
  511 + map.put("尾期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getEndCheckApplyTime()) ?
  512 + inspectionStageInfo.getEndCheckApplyTime() :
  513 + DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getEndCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
486 514 }
487 515 if (StringUtils.isNotBlank(inspectionStageFields.getSpecification()) &&
488 516 OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getSpecification())) {
... ... @@ -513,7 +541,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
513 541 map.put("包装：卡片、条码、箱贴，箱单", inspectionStageInfo.getBoxPacket());
514 542 }
515 543 if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckResult()) &&
516   - OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageInfo.getEndCheckResult())) {
  544 + OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getEndCheckResult())) {
517 545 map.put("尾期验货结果PASS / FAIL", inspectionStageInfo.getEndCheckResult());
518 546 }
519 547 }
... ...