裂解炉炉管测温测压 - 数据提交校验bugfix

master/src/main/java/com/ruoyi/project/production/controller/TFurnancePressureController.java

@@ -3282,41 +3282,72 @@ public class TFurnancePressureController extends BaseController
         String pass14 = tFurnancePressure.getPass14();
         String pass15 = tFurnancePressure.getPass15();
         String pass16 = tFurnancePressure.getPass16();
-        if (this.isPassNegativeOrNull(pass1)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass2)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass3)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass4)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass5)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass6)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass7)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass8)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass9)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass10)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass11)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass12)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass13)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass14)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass15)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass16)) {
-            return true;
+        if ("H109".equals(tFurnancePressure.getFurnanceName())) {
+            if (this.isPassNegativeOrNull(pass1)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass2)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass3)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass4)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass5)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass6)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass7)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass8)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass9)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass10)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass11)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass12)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass13)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass14)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass15)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass16)) {
+                return true;
+            } else {
+                return false;
+            }
+        } else if ("H130".equals(tFurnancePressure.getFurnanceName())) {
+            if (this.isPassNegativeOrNull(pass1)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass2)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass3)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass4)) {
+                return true;
+            }
         } else {
-            return false;
-        }
+            if (this.isPassNegativeOrNull(pass1)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass2)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass3)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass4)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass5)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass6)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass7)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass8)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     public boolean isPassNegativeOrNull(String pass) {

master/src/main/java/com/ruoyi/project/production/controller/TFurnanceTemperatureController.java

@@ -1488,41 +1488,88 @@ public class TFurnanceTemperatureController extends BaseController
         String pass14 = tFurnanceTemperature.getPass14();
         String pass15 = tFurnanceTemperature.getPass15();
         String pass16 = tFurnanceTemperature.getPass16();
-        if (this.isPassNegativeOrNull(pass1)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass2)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass3)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass4)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass5)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass6)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass7)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass8)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass9)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass10)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass11)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass12)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass13)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass14)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass15)) {
-            return true;
-        } else if (this.isPassNegativeOrNull(pass16)) {
-            return true;
+        if ("H109".equals(tFurnanceTemperature.getFurnanceName())) {
+            if (this.isPassNegativeOrNull(pass1)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass2)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass3)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass4)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass5)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass6)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass7)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass8)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass9)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass10)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass11)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass12)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass13)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass14)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass15)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass16)) {
+                return true;
+            } else {
+                return false;
+            }
+        } else if ("H130".equals(tFurnanceTemperature.getFurnanceName())) {
+            if (this.isPassNegativeOrNull(pass1)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass2)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass3)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass4)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass5)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass6)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass7)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass8)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass9)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass10)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass11)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass12)) {
+                return true;
+            }
         } else {
-            return false;
+            if (this.isPassNegativeOrNull(pass1)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass2)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass3)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass4)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass5)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass6)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass7)) {
+                return true;
+            } else if (this.isPassNegativeOrNull(pass8)) {
+                return true;
+            }
         }
+        return false;
     }
 
     public boolean isPassNegativeOrNull(String pass) {