From 9eb16986d03e759f9ab5f82624d0a27591f47f17 Mon Sep 17 00:00:00 2001
From: sunhao <479527147@qq.com>
Date: Mon, 10 Mar 2025 11:32:31 +0800
Subject: [PATCH] =?UTF-8?q?2025-03-10=20=E5=88=86=E7=BB=84=E5=8E=9A?=
 =?UTF-8?q?=E5=BA=A6=E7=9B=B8=E5=90=8C=20S=E5=9E=8B=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=9D=A1=E4=BB=B6=E5=92=8C=E8=BD=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8E=9A=E5=BA=A6=3D=E8=AE=A2=E5=8D=95=E5=8E=9A=E5=BA=A6+?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8E=9A=E5=BA=A6+=E5=8E=9A=E5=BA=A6?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xisc/pm/api/controller/v1/SubController.java   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 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 92e28c9..13a9434 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
@@ -841,6 +841,10 @@ public class SubController {
                     GCG.setWid_Rate(decWidRate);
 
                     BigDecimal decThkOrd = GCG.getLtInfoGPreOrder().get(0).getThk();
+
+                    //厚度
+                    GCG.setOrder_Thk(decThkOrd);
+
                     //压缩比
                     BigDecimal decThkRate =decThkOrd.divide(SInfo.getSlabActThk(), 2, RoundingMode.HALF_UP);
 
@@ -998,7 +1002,8 @@ public class SubController {
 
                 gltGCalGrp.parallelStream().forEach(f -> {
 
-                    if (f.getWid()+e.getWid()<4980){
+                    //宽度满足要求和厚度相同
+                    if (f.getWid()+e.getWid()<4980 && e.getThk().equals(f.getThk())){
 
                         e.getLtInfoGPreOrder().forEach(i -> {
 
@@ -1135,6 +1140,9 @@ public class SubController {
                                         GCG.setWid_Rate(decWidRate);
 
                                         BigDecimal decThkOrd = GCG.getLtInfoGPreOrder().get(0).getThk();
+
+                                        GCG.setOrder_Thk(decThkOrd);
+
                                         //压缩比
                                         BigDecimal decThkRate =decThkOrd.divide(SInfo.getSlabActThk(), 2, RoundingMode.HALF_UP);
 
@@ -1209,8 +1217,8 @@ public class SubController {
                                         //厚度追加值
                                         GCG.setThk_Add(decThkAdd);
 
-                                        //轧制厚度   厚度+厚度公差下限最大值+厚度追加值
-                                        BigDecimal decThk = e.getThk().add(maxTolThkMin.orElse(BigDecimal.ZERO)).add(decThkAdd);
+                                        //轧制厚度   厚度+厚度公差下限最大值+厚度追加值  订单厚度+厚度追加值
+                                        BigDecimal decThk = e.getOrder_Thk().add(maxTolThkMin.orElse(BigDecimal.ZERO)).add(decThkAdd);
 
                                         //轧制宽度   最大宽度+宽度余量
                                         int intWid = maxWidth + maxAddWidth.orElse(0);