2025-03-20

XG_Project1/src/main/java/com/xisc/pm/api/controller/v1/SubController.java

@@ -905,11 +905,11 @@ public class SubController {
                         return;
                     }
 
-                    //产线相同
-                    if (!SInfo.getMscLineNo().equals(f.getInfoPmContMscTechDO().getMscLineNo()))
-                    {
-                        return;
-                    }
+//                    //产线相同
+//                    if (!SInfo.getMscLineNo().equals(f.getInfoPmContMscTechDO().getMscLineNo()))
+//                    {
+//                        return;
+//                    }
 
                     //化学成分  chemical composition
                     if (!ChkChemical(SInfo, f)) {
@@ -1462,19 +1462,25 @@ public class SubController {
 
         List<QeTqHeatcheStandResultDO> ltQthsr = plistQeTqHeatcheStandResultDO.stream().filter(p -> p.getPono().equals(SInfo.getPono())).collect(Collectors.toList());
 
-        //判断合同的每个化学成分是否满足条件
-        boolean blnChk = ltLrc.stream().anyMatch(p -> {
-            if (!ltQthsr.stream().anyMatch(e -> e.getElm().equals(p.getElm())
-                    && (e.getTestOriginalResult().compareTo(NumberUtils.createBigDecimal(p.getElmMin())) >= 0
-                    && e.getTestOriginalResult().compareTo(NumberUtils.createBigDecimal(p.getElmMax())) <= 0))) {
+        try {
+            //判断合同的每个化学成分是否满足条件
+            boolean blnChk = ltLrc.stream().anyMatch(p -> {
+                if (!ltQthsr.stream().anyMatch(e -> e.getElm().equals(p.getElm())
+                        && (e.getTestOriginalResult().compareTo(NumberUtils.createBigDecimal(p.getElmMin())) >= 0
+                        && e.getTestOriginalResult().compareTo(NumberUtils.createBigDecimal(p.getElmMax())) <= 0))) {
+                    return false;
+                }
+                return true;
+            });
+
+            if (!blnChk) {
                 return false;
             }
-            return true;
-        });
-
-        if (!blnChk) {
+        }catch (Exception ex)
+        {
             return false;
         }
+
         return true;
     }
 
@@ -2397,7 +2403,8 @@ public class SubController {
                                 && e.getCombinePlateWidthFrom().compareTo(BigDecimal.valueOf(maxWidth.orElse(0) + maxAddWidth.orElse(0))) <= 0
                                 && e.getCombinePlateWidthTo().compareTo(BigDecimal.valueOf(maxWidth.orElse(0) + maxAddWidth.orElse(0))) >= 0
                 )) {
-                    if (p.getLtInfoGPreOrder().get(0).getInfoPmContMscTechDO().getWholeHeatTreatmentType().contains("Q")) {
+                    if (p.getLtInfoGPreOrder().get(0).getInfoPmContMscTechDO().getWholeHeatTreatmentType()!=null &&
+                            p.getLtInfoGPreOrder().get(0).getInfoPmContMscTechDO().getWholeHeatTreatmentType().contains("Q")) {
                         decThkAdd = plistPmThickAddvBtDO.stream().filter(e -> e.getMscLineNo().equals(SInfo.getMscLineNo())
                                         && e.getTolTypeCode().equals(strThkTolType)
 //                                && e.getTolTypeCode().equals(p.getLtInfoGPreOrder().get(0).getInfoQdToPoOrderDO().getThkTolType())

XG_Project1/src/main/resources/application-dev.yml

@@ -12,10 +12,7 @@ spring:
       maximum-pool-size: ${SPRING_DATASOURCE_MAXIMUM_POOL_SIZE:200}
       # 等待连接池分配连接的最大时长（毫秒）
       connection-timeout: ${SPRING_DATASOURCE_CONNECTION_TIMEOUT:30000}
-  devtools:
-    restart:
-      enabled: true  # 启用自动重启功能
-      interval: 5000  # 设置检查类路径变化的间隔时间为 5 秒（5000 毫秒）
+
   redis:
     host: ${SPRING_REDIS_HOST:172.18.15.29}
     port: ${SPRING_REDIS_PORT:6379}

XG_Project1/src/main/resources/application.yml

@@ -12,10 +12,7 @@ spring:
       maximum-pool-size: ${SPRING_DATASOURCE_MAXIMUM_POOL_SIZE:200}
       # 等待连接池分配连接的最大时长（毫秒）
       connection-timeout: ${SPRING_DATASOURCE_CONNECTION_TIMEOUT:30000}
-  devtools:
-    restart:
-      enabled: true  # 启用自动重启功能
-      interval: 5000  # 设置检查类路径变化的间隔时间为 5 秒（5000 毫秒）
+
   redis:
     host: ${SPRING_REDIS_HOST:172.18.15.29}
     port: ${SPRING_REDIS_PORT:6379}