2025-03-10

分组厚度相同
S型分组匹配条件和轧制厚度=订单厚度+订单厚度+厚度追加值

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);