feat: 问题修复项

1、1225问题项修复

feat: 问题修复项
1、1225问题项修复
谢茂盛
1 parent 7943a0b5
Showing 1 changed file with 96 additions and 43 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -326,15 +326,23 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(baseFields.getProductionDepartmentConsignTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProductionDepartmentConsignTime())) {
-                    map.put("生产科拖货时间", StringUtils.isBlank(orderInfoResultVO.getProductionDepartmentConsignTime()) ?
-                            orderInfoResultVO.getProductionDepartmentConsignTime() :
-                            DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getProductionDepartmentConsignTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    try {
+                        map.put("生产科拖货时间", StringUtils.isBlank(orderInfoResultVO.getProductionDepartmentConsignTime()) ?
+                                orderInfoResultVO.getProductionDepartmentConsignTime() :
+                                DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getProductionDepartmentConsignTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    } catch (Exception e) {
+                        map.put("生产科拖货时间", orderInfoResultVO.getProductionDepartmentConsignTime());
+                    }
                 }
                 if (StringUtils.isNotBlank(baseFields.getOrderHodTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOrderHodTime())) {
-                    map.put("订单上HOD时间", StringUtils.isBlank(orderInfoResultVO.getOrderHodTime()) ?
-                            orderInfoResultVO.getOrderHodTime() :
-                            DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getOrderHodTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    try {
+                        map.put("订单上HOD时间", StringUtils.isBlank(orderInfoResultVO.getOrderHodTime()) ?
+                                orderInfoResultVO.getOrderHodTime() :
+                                DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getOrderHodTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    } catch (Exception e) {
+                        map.put("订单上HOD时间", orderInfoResultVO.getOrderHodTime());
+                    }
                 }
                 if (StringUtils.isNotBlank(baseFields.getOutboundType()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOutboundType())) {
@@ -423,9 +431,13 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             if (Objects.nonNull(trackStageFields) && Objects.nonNull(trackStageInfo)) {
                 if (StringUtils.isNotBlank(trackStageFields.getPpTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getPpTime())) {
-                    map.put("pp date", StringUtils.isBlank(trackStageInfo.getPpTime()) ?
-                            trackStageInfo.getPpTime() :
-                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getPpTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    try {
+                        map.put("pp date", StringUtils.isBlank(trackStageInfo.getPpTime()) ?
+                                trackStageInfo.getPpTime() :
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getPpTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    } catch (Exception e) {
+                        map.put("pp date", trackStageInfo.getPpTime());
+                    }
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getPpConfirmResult()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getPpConfirmResult())) {
@@ -433,15 +445,25 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getEsoSampleSendTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getEsoSampleSendTime())) {
-                    map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", StringUtils.isBlank(trackStageInfo.getEsoSampleSendTime()) ?
-                            trackStageInfo.getEsoSampleSendTime() :
-                                    DateUtils.format(DateUtils.parseDate(trackStageInfo.getEsoSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    try {
+                        map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", StringUtils.isBlank(trackStageInfo.getEsoSampleSendTime()) ?
+                                trackStageInfo.getEsoSampleSendTime() :
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getEsoSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    } catch (Exception e) {
+                        map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", trackStageInfo.getEsoSampleSendTime());
+                    }
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleSendTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getShippmentSampleSendTime())) {
-                    map.put("shippment sample 发送时间", StringUtils.isBlank(trackStageInfo.getShippmentSampleSendTime()) ?
-                            trackStageInfo.getShippmentSampleSendTime() :
-                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getShippmentSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    try {
+                        map.put("shippment sample 发送时间", StringUtils.isBlank(trackStageInfo.getShippmentSampleSendTime()) ?
+                                trackStageInfo.getShippmentSampleSendTime() :
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getShippmentSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+
+                    } catch (Exception e) {
+                        map.put("shippment sample 发送时间", trackStageInfo.getShippmentSampleSendTime());
+
+                    }
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleConfirmResult()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getShippmentSampleConfirmResult())) {
@@ -449,27 +471,37 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getSelfTestPassTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSelfTestPassTime())) {
-                    map.put("自测通过时间", StringUtils.isBlank(trackStageInfo.getSelfTestPassTime()) ?
-                            trackStageInfo.getSelfTestPassTime() :
-                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getSelfTestPassTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    try {
+                        map.put("自测通过时间", StringUtils.isBlank(trackStageInfo.getSelfTestPassTime()) ?
+                                trackStageInfo.getSelfTestPassTime() :
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getSelfTestPassTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    } catch (Exception e) {
+                        map.put("自测通过时间", trackStageInfo.getSelfTestPassTime());
+                    }
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getAitexTestSendTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getAitexTestSendTime())) {
-                    map.put("Aitex测试发送时间", StringUtils.isBlank(trackStageInfo.getAitexTestSendTime()) ?
-                            trackStageInfo.getAitexTestSendTime() :
-                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    try {
+                        map.put("Aitex测试发送时间", StringUtils.isBlank(trackStageInfo.getAitexTestSendTime()) ?
+                                trackStageInfo.getAitexTestSendTime() :
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    } catch (Exception e) {
+                        map.put("Aitex测试发送时间", trackStageInfo.getAitexTestSendTime());
+                    }
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getAitexTestFinishResult()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getAitexTestFinishResult())) {
-                    map.put("Aitex测试结果", StringUtils.isBlank(trackStageInfo.getAitexTestFinishResult()) ?
-                            trackStageInfo.getAitexTestFinishResult() :
-                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    map.put("Aitex测试结果", trackStageInfo.getAitexTestFinishResult());
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getSgsTestSendTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestSendTime())) {
-                    map.put("SGS测试发送时间", StringUtils.isBlank(trackStageInfo.getSgsTestSendTime()) ?
-                            trackStageInfo.getSgsTestSendTime() :
-                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getSgsTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    try {
+                        map.put("SGS测试发送时间", StringUtils.isBlank(trackStageInfo.getSgsTestSendTime()) ?
+                                trackStageInfo.getSgsTestSendTime() :
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getSgsTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    } catch (Exception e) {
+                        map.put("SGS测试发送时间", trackStageInfo.getSgsTestSendTime());
+                    }
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getSgsTestFinishResult()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestFinishResult())) {
@@ -477,21 +509,34 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getBarcodeStickerArrivalTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getBarcodeStickerArrivalTime())) {
-                    map.put("Barcode sticker arrival time", StringUtils.isBlank(trackStageInfo.getBarcodeStickerArrivalTime()) ?
-                            trackStageInfo.getBarcodeStickerArrivalTime() :
-                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getBarcodeStickerArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    try {
+                        map.put("Barcode sticker arrival time", StringUtils.isBlank(trackStageInfo.getBarcodeStickerArrivalTime()) ?
+                                trackStageInfo.getBarcodeStickerArrivalTime() :
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getBarcodeStickerArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    } catch (Exception e) {
+                        map.put("Barcode sticker arrival time", trackStageInfo.getBarcodeStickerArrivalTime());
+                    }
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getLatestArrivalTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getLatestArrivalTime())) {
-                    map.put("最晚包材到货时间", StringUtils.isBlank(trackStageInfo.getLatestArrivalTime()) ?
-                            trackStageInfo.getLatestArrivalTime() :
-                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    try {
+                        map.put("最晚包材到货时间", StringUtils.isBlank(trackStageInfo.getLatestArrivalTime()) ?
+                                trackStageInfo.getLatestArrivalTime() :
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    } catch (Exception e) {
+                        map.put("最晚包材到货时间", trackStageInfo.getLatestArrivalTime());
+                    }
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getLatestBkTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getLatestBkTime())) {
-                    map.put("最晚订舱+报关资料时间", StringUtils.isBlank(trackStageInfo.getLatestBkTime()) ?
-                            trackStageInfo.getLatestBkTime() :
-                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestBkTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    try {
+                        map.put("最晚订舱+报关资料时间", StringUtils.isBlank(trackStageInfo.getLatestBkTime()) ?
+                                trackStageInfo.getLatestBkTime() :
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestBkTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    } catch (Exception e) {
+                        map.put("最晚订舱+报关资料时间", trackStageInfo.getLatestBkTime());
+
+                    }
                 }
             }
             OrderInspectionStageVO inspectionStageInfo = Objects.nonNull(orderInfoResultVO.getInspectionStageInfo()) ?
@@ -499,9 +544,13 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             if (Objects.nonNull(inspectionStageFields) && Objects.nonNull(inspectionStageInfo)) {
                 if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckApplyTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckApplyTime())) {
-                    map.put("中期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getMidCheckApplyTime()) ?
-                            inspectionStageInfo.getMidCheckApplyTime() :
-                            DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getMidCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    try {
+                        map.put("中期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getMidCheckApplyTime()) ?
+                                inspectionStageInfo.getMidCheckApplyTime() :
+                                DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getMidCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    } catch (Exception e) {
+                        map.put("中期验货申请时间", inspectionStageInfo.getMidCheckApplyTime());
+                    }
                 }
                 if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckComment()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckComment())) {
@@ -513,9 +562,13 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckApplyTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getEndCheckApplyTime())) {
-                    map.put("尾期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getEndCheckApplyTime()) ?
-                            inspectionStageInfo.getEndCheckApplyTime() :
-                            DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getEndCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    try {
+                        map.put("尾期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getEndCheckApplyTime()) ?
+                                inspectionStageInfo.getEndCheckApplyTime() :
+                                DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getEndCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                    } catch (Exception e) {
+                        map.put("尾期验货申请时间", inspectionStageInfo.getEndCheckApplyTime());
+                    }
                 }
                 if (StringUtils.isNotBlank(inspectionStageFields.getSpecification()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getSpecification())) {
@@ -860,7 +913,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         if (StringUtils.isBlank(inspectionStageInfo.getEndCheckResult())) {
             return false;
-        } else if ("FAIL".equals(inspectionStageInfo.getEndCheckResult())) {
+        } else if ("FAIL" .equals(inspectionStageInfo.getEndCheckResult())) {
             return false;
         }
         return true;