裂解炉炉管测温 - 烧焦状态无法提交bugfix

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

@@ -1320,12 +1320,18 @@ public class TFurnanceTemperatureController extends BaseController
     @PutMapping("/editWeb")
     public AjaxResult editWeb(@RequestBody TFurnanceTemperature tFurnanceTemperature)
     {
-        // 检查数据是否包含负值或为Null
-        String msg = this.isNegativeOrNull(tFurnanceTemperature);
-        if ("".equals(msg)) {
-            return toAjax(tFurnanceTemperatureService.updateTFurnanceTemperature(tFurnanceTemperature));
+        String status = tFurnanceTemperature.getStatus();
+        // 烧焦状态不检查
+        if (!"2".equals(status)) {
+            // 检查数据是否包含负值或为Null
+            String msg = this.isNegativeOrNull(tFurnanceTemperature);
+            if ("".equals(msg)) {
+                return toAjax(tFurnanceTemperatureService.updateTFurnanceTemperature(tFurnanceTemperature));
+            } else {
+                return AjaxResult.error("提交失败，" + msg + "数据必须>=600，并且<=1300！");
+            }
         } else {
-            return AjaxResult.error("提交失败，" + msg + "数据必须>=600，并且<=1300！");
+            return toAjax(tFurnanceTemperatureService.updateTFurnanceTemperature(tFurnanceTemperature));
         }
     }
 

ui/src/views/production/temperature/h109.vue

@@ -513,7 +513,7 @@
         return this.selectDictLabel(this.teamOptions, row.team);
       },
       handleChange() {
-        if (this.form.status === '1') {
+        if (this.form.status === '2') {
           this.pass1 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass2 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass3 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];

ui/src/views/production/temperature/h110.vue

@@ -405,7 +405,7 @@
         return this.selectDictLabel(this.statusOptions, row.status);
       },
       handleChange() {
-        if (this.form.status === '1') {
+        if (this.form.status === '2') {
           this.pass1 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass2 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass3 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];

ui/src/views/production/temperature/h111.vue

@@ -405,7 +405,7 @@
         return this.selectDictLabel(this.statusOptions, row.status);
       },
       handleChange() {
-        if (this.form.status === '1') {
+        if (this.form.status === '2') {
           this.pass1 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass2 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass3 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];

ui/src/views/production/temperature/h112.vue

@@ -405,7 +405,7 @@
         return this.selectDictLabel(this.statusOptions, row.status);
       },
       handleChange() {
-        if (this.form.status === '1') {
+        if (this.form.status === '2') {
           this.pass1 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass2 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass3 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];

ui/src/views/production/temperature/h113.vue

@@ -404,7 +404,7 @@
         return this.selectDictLabel(this.statusOptions, row.status);
       },
       handleChange() {
-        if (this.form.status === '1') {
+        if (this.form.status === '2') {
           this.pass1 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass2 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass3 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];

ui/src/views/production/temperature/h114.vue

@@ -405,7 +405,7 @@
         return this.selectDictLabel(this.statusOptions, row.status);
       },
       handleChange() {
-        if (this.form.status === '1') {
+        if (this.form.status === '2') {
           this.pass1 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass2 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass3 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];

ui/src/views/production/temperature/h115.vue

@@ -405,7 +405,7 @@
         return this.selectDictLabel(this.statusOptions, row.status);
       },
       handleChange() {
-        if (this.form.status === '1') {
+        if (this.form.status === '2') {
           this.pass1 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass2 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass3 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];

ui/src/views/production/temperature/h116.vue

@@ -405,7 +405,7 @@
         return this.selectDictLabel(this.statusOptions, row.status);
       },
       handleChange() {
-        if (this.form.status === '1') {
+        if (this.form.status === '2') {
           this.pass1 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass2 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass3 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];

ui/src/views/production/temperature/h117.vue

@@ -405,7 +405,7 @@
         return this.selectDictLabel(this.statusOptions, row.status);
       },
       handleChange() {
-        if (this.form.status === '1') {
+        if (this.form.status === '2') {
           this.pass1 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass2 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass3 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];

ui/src/views/production/temperature/h118.vue

@@ -405,7 +405,7 @@
         return this.selectDictLabel(this.teamOptions, row.team);
       },
       handleChange() {
-        if (this.form.status === '1') {
+        if (this.form.status === '2') {
           this.pass1 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass2 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];
           this.pass3 = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0"];

ui/src/views/production/temperature/h130.vue

@@ -461,7 +461,7 @@
         return this.selectDictLabel(this.statusOptions, row.status);
       },
       handleChange() {
-        if (this.form.status === '1') {
+        if (this.form.status === '2') {
           this.pass1 = ["0", "0", "0"];
           this.pass2 = ["0", "0", "0"];
           this.pass3 = ["0", "0", "0"];