Merge remote-tracking branch 'origin/master'

src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java

@@ -403,27 +403,27 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
                 Date existingEffPhaseOutDate = existingBomHeader.getEffPhaseOutDate();
 
                 // 如果新对象的开始时间在现有对象的时间范围内，则重叠
-                if (newEffPhaseInDate.after(existingEffPhaseInDate) && newEffPhaseInDate.before(existingEffPhaseOutDate)) {
+                if (newEffPhaseInDate != null && newEffPhaseInDate.after(existingEffPhaseInDate) && newEffPhaseInDate.before(existingEffPhaseOutDate)) {
                     b = true;
                     break;
                 }
                 // 如果新对象的结束时间在现有对象的时间范围内，则重叠
-                else if (newEffPhaseOutDate.after(existingEffPhaseInDate) && newEffPhaseOutDate.before(existingEffPhaseOutDate)) {
+                else if (newEffPhaseInDate != null && newEffPhaseOutDate.after(existingEffPhaseInDate) && newEffPhaseOutDate.before(existingEffPhaseOutDate)) {
                     b = true;
                     break;
                 }
                 // 如果现有对象的开始时间在新对象的时间范围内，则重叠
-                else if (existingEffPhaseInDate.after(newEffPhaseInDate) && existingEffPhaseInDate.before(newEffPhaseOutDate)) {
+                else if (existingEffPhaseInDate != null && existingEffPhaseInDate.after(newEffPhaseInDate) && existingEffPhaseInDate.before(newEffPhaseOutDate)) {
                     b = true;
                     break;
                 }
                 // 如果现有对象的结束时间在新对象的时间范围内，则重叠
-                else if (existingEffPhaseOutDate.after(newEffPhaseInDate) && existingEffPhaseOutDate.before(newEffPhaseOutDate)) {
+                else if (existingEffPhaseOutDate != null && existingEffPhaseOutDate.after(newEffPhaseInDate) && existingEffPhaseOutDate.before(newEffPhaseOutDate)) {
                     b = true;
                     break;
                 }
                 // 如果两个时间段完全相同，则重叠
-                else if (newEffPhaseInDate.equals(existingEffPhaseInDate) && newEffPhaseOutDate.equals(existingEffPhaseOutDate)) {
+                else if (newEffPhaseInDate != null && newEffPhaseInDate.equals(existingEffPhaseInDate) && newEffPhaseOutDate.equals(existingEffPhaseOutDate)) {
                     b = true;
                     break;
                 }
@@ -1044,6 +1044,7 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
                 b.setPartNo(data.getPartNo());
                 b.setBomType(data.getBomType());
                 b.setEngChgLevel(data.getEngChgLevel());
+                b.setAlternativeNo(data.getAlternativeNo());
                 return b;
             }).collect(Collectors.toList());
             bomManagementMapper.saveBomManufStructCostDistrib(collect1);
@@ -1056,6 +1057,8 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
         BomHeaderVo headerVo = new BomHeaderVo();
         BeanUtils.copyProperties(bomHeaderEntity,headerVo);
         headerVo.setAlternativeNo(data.getAlternativeNo());
+        headerVo.setPartDesc(partInformationEntity.getPartDesc());
+        headerVo.setPrintUnit(partInformationEntity.getUmId());
         return headerVo;
     }