修改裂解炉炉管测压

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

@@ -2197,51 +2197,64 @@ public class TFurnancePressureController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TFurnancePressure tFurnancePressure)
     {
-        String furnanceName = tFurnancePressure.getFurnanceName();
+        //更新
+        tFurnancePressureService.updateTFurnancePressure(tFurnancePressure);
+        //计算ratio
+        TFurnancePressure pressure = tFurnancePressureService.selectTFurnancePressureById(tFurnancePressure.getId());
+        String furnanceName = pressure.getFurnanceName();
         List<TFurnancePressure> list = new ArrayList();
-        list.add(tFurnancePressure);
+        list.add(pressure);
         switch (furnanceName) {
             case "H109":
                 FurnancePressureFvpVO furnancePressureFvpVO109A = this.calcRatio109A(list);
                 FurnancePressureFvpVO furnancePressureFvpVO109B = this.calcRatio109B(list);
-                this.checkRatio(furnancePressureFvpVO109A, tFurnancePressure);
-                this.checkRatio(furnancePressureFvpVO109B, tFurnancePressure);
+                this.checkRatio(furnancePressureFvpVO109A, pressure);
+                this.checkRatio(furnancePressureFvpVO109B, pressure);
                 break;
             case "H110":
                 FurnancePressureFvpVO furnancePressureFvpVO110 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO110, tFurnancePressure);
+                this.checkRatio(furnancePressureFvpVO110, pressure);
+                break;
             case "H111":
                 FurnancePressureFvpVO furnancePressureFvpVO111 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO111, tFurnancePressure);
+                this.checkRatio(furnancePressureFvpVO111, pressure);
+                break;
             case "H112":
                 FurnancePressureFvpVO furnancePressureFvpVO112 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO112, tFurnancePressure);
+                this.checkRatio(furnancePressureFvpVO112, pressure);
+                break;
             case "H113":
                 FurnancePressureFvpVO furnancePressureFvpVO113 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO113, tFurnancePressure);
+                this.checkRatio(furnancePressureFvpVO113, pressure);
+                break;
             case "H114":
                 FurnancePressureFvpVO furnancePressureFvpVO114 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO114, tFurnancePressure);
+                this.checkRatio(furnancePressureFvpVO114, pressure);
+                break;
             case "H115":
                 FurnancePressureFvpVO furnancePressureFvpVO115 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO115, tFurnancePressure);
+                this.checkRatio(furnancePressureFvpVO115, pressure);
+                break;
             case "H116":
                 FurnancePressureFvpVO furnancePressureFvpVO116 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO116, tFurnancePressure);
+                this.checkRatio(furnancePressureFvpVO116, pressure);
+                break;
             case "H117":
                 FurnancePressureFvpVO furnancePressureFvpVO117 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO117, tFurnancePressure);
+                this.checkRatio(furnancePressureFvpVO117, pressure);
+                break;
             case "H118":
                 FurnancePressureFvpVO furnancePressureFvpVO118 = this.calcRatio(list);
-                this.checkRatio(furnancePressureFvpVO118, tFurnancePressure);
+                this.checkRatio(furnancePressureFvpVO118, pressure);
                 break;
             case "H130":
                 FurnancePressureFvpVO furnancePressureFvpVO130 = this.calcRatio130(list);
-                this.checkRatio(furnancePressureFvpVO130, tFurnancePressure);
+                this.checkRatio(furnancePressureFvpVO130, pressure);
                 break;
         }
-        int result = tFurnancePressureService.updateTFurnancePressure(tFurnancePressure);
-        return AjaxResult.success(result+"", tFurnancePressure);
+        //更新
+        int result = tFurnancePressureService.updateTFurnancePressure(pressure);
+        return AjaxResult.success(result+"", pressure);
     }
     public void checkRatio(FurnancePressureFvpVO vo, TFurnancePressure pressure) {
         double pass1Ratio = vo.getPass1Ratio();