From 3e17be09340a0acb89931bb9699859d41fcc02b1 Mon Sep 17 00:00:00 2001
From: sunhao <479527147@qq.com>
Date: Mon, 10 Mar 2025 10:55:09 +0800
Subject: [PATCH] =?UTF-8?q?2025-03-10=20=E5=88=86=E7=BB=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=BF=BD=E5=8A=A0=E8=BF=87=E7=A8=8B=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pm/api/controller/v1/SubController.java   | 53 ++++++++++++++++++-
 .../com/xisc/pm/api/dto/model/GCalGrp.java    |  6 +++
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/XG_Project1/src/main/java/com/xisc/pm/api/controller/v1/SubController.java b/XG_Project1/src/main/java/com/xisc/pm/api/controller/v1/SubController.java
index 93897a7..92e28c9 100644
--- a/XG_Project1/src/main/java/com/xisc/pm/api/controller/v1/SubController.java
+++ b/XG_Project1/src/main/java/com/xisc/pm/api/controller/v1/SubController.java
@@ -772,7 +772,11 @@ public class SubController {
 
             //压缩比  Compression ratio
 
+
+
             //宽展比 Wide ratio
+            //GCG.getLtInfoGPreOrder().stream().filter(e->e.)
+            //最大宽度
 
             //钢种标准对比
 
@@ -794,7 +798,7 @@ public class SubController {
                         return;
                     }
 
-//                    化学成分  chemical composition
+                    //化学成分  chemical composition
                     if (!ChkChemical(SInfo, f)) {
                         return;
                     }
@@ -833,10 +837,30 @@ public class SubController {
                     //宽展比   保留2位小数
                     BigDecimal decWidRate = BigDecimal.valueOf(maxWidth.orElse(0)).divide(SInfo.getSlabActWid(), 2, RoundingMode.HALF_UP);
 
-                    //最大厚度公差最小值
+                    //宽展比
+                    GCG.setWid_Rate(decWidRate);
+
+                    BigDecimal decThkOrd = GCG.getLtInfoGPreOrder().get(0).getThk();
+                    //压缩比
+                    BigDecimal decThkRate =decThkOrd.divide(SInfo.getSlabActThk(), 2, RoundingMode.HALF_UP);
+
+                    //压缩比
+                    GCG.setThk_Rate(decThkRate);
+
+                    //最大厚度公差下限最大值
                     Optional<BigDecimal> maxTolThkMin = GCG.getLtInfoGPreOrder().stream()
                             .map(GPreOrder::getThickTolMin)
                             .reduce(BigDecimal::max);
+
+                    //最大厚度公差上限最小值
+                    Optional<BigDecimal> maxTolThkMax = GCG.getLtInfoGPreOrder().stream()
+                            .map(GPreOrder::getThickTolMax)
+                            .reduce(BigDecimal::min);
+                    //厚度公差交集上限
+                    GCG.setThickTolMax(maxTolThkMax.orElse(BigDecimal.ZERO));
+                    //厚度公差交集上限
+                    GCG.setThickTolMin(maxTolThkMin.orElse(BigDecimal.ZERO));
+
                     //厚度追加值
                     BigDecimal decThkAdd= BigDecimal.ZERO;
 
@@ -892,6 +916,9 @@ public class SubController {
 
                     }
 
+                    //厚度追加值
+                    GCG.setThk_Add(decThkAdd);
+
                     //轧制厚度   厚度+厚度公差下限最大值+厚度追加值
                     BigDecimal decThk = e.getThk().add(maxTolThkMin.orElse(BigDecimal.ZERO)).add(decThkAdd);
 
@@ -1104,6 +1131,25 @@ public class SubController {
                                                 .map(GPreOrder::getThickTolMin)
                                                 .reduce(BigDecimal::max);
 
+                                        //宽展比
+                                        GCG.setWid_Rate(decWidRate);
+
+                                        BigDecimal decThkOrd = GCG.getLtInfoGPreOrder().get(0).getThk();
+                                        //压缩比
+                                        BigDecimal decThkRate =decThkOrd.divide(SInfo.getSlabActThk(), 2, RoundingMode.HALF_UP);
+
+                                        //压缩比
+                                        GCG.setThk_Rate(decThkRate);
+
+                                        //最大厚度公差上限最小值
+                                        Optional<BigDecimal> maxTolThkMax = GCG.getLtInfoGPreOrder().stream()
+                                                .map(GPreOrder::getThickTolMax)
+                                                .reduce(BigDecimal::min);
+                                        //厚度公差交集上限
+                                        GCG.setThickTolMax(maxTolThkMax.orElse(BigDecimal.ZERO));
+                                        //厚度公差交集上限
+                                        GCG.setThickTolMin(maxTolThkMin.orElse(BigDecimal.ZERO));
+
                                         //厚度追加值
                                         BigDecimal decThkAdd = BigDecimal.ZERO;
 
@@ -1160,6 +1206,9 @@ public class SubController {
 
                                         }
 
+                                        //厚度追加值
+                                        GCG.setThk_Add(decThkAdd);
+
                                         //轧制厚度   厚度+厚度公差下限最大值+厚度追加值
                                         BigDecimal decThk = e.getThk().add(maxTolThkMin.orElse(BigDecimal.ZERO)).add(decThkAdd);
 
diff --git a/XG_Project1/src/main/java/com/xisc/pm/api/dto/model/GCalGrp.java b/XG_Project1/src/main/java/com/xisc/pm/api/dto/model/GCalGrp.java
index f0ea878..1aca7e4 100644
--- a/XG_Project1/src/main/java/com/xisc/pm/api/dto/model/GCalGrp.java
+++ b/XG_Project1/src/main/java/com/xisc/pm/api/dto/model/GCalGrp.java
@@ -31,6 +31,12 @@ public class GCalGrp {
     private BigDecimal thickTolMax;
     //厚度公差下限
     private BigDecimal thickTolMin;
+    //厚度追加值
+    private BigDecimal thk_Add;
+    //压缩比
+    private BigDecimal thk_Rate;
+    //宽度比
+    private BigDecimal wid_Rate;
 
     //标准
     private String SG_STD;