From 69bf3cc4f34198852f794b61919ea9139d712a4a Mon Sep 17 00:00:00 2001
From: sunhao <479527147@qq.com>
Date: Thu, 20 Mar 2025 14:44:24 +0800
Subject: [PATCH] 2025-03-20

---
 .../pm/api/controller/v1/SubController.java   | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 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 a5565ad..e9f97d7 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
@@ -394,7 +394,7 @@ public class SubController {
 
                         logger.info("***二次分组1数量***  " + gltGCalGrp.size());
 
-                        logger.info("***二次分组21数量***  " + gltGCal2Grp.size());
+                        logger.info("***二次分组2数量***  " + gltGCal2Grp.size());
 
                         gltGCalGrp.addAll(gltGCal2Grp);
 
@@ -557,8 +557,6 @@ public class SubController {
      */
     public void GetDataInfo(SubParams subParams) {
 
-
-
         logger.info("*****开始获取数据******");
 
         //region  ***多线程获取基础数据***
@@ -885,8 +883,6 @@ public class SubController {
 
             //压缩比  Compression ratio
 
-
-
             //宽展比 Wide ratio
             //GCG.getLtInfoGPreOrder().stream().filter(e->e.)
             //最大宽度
@@ -958,6 +954,9 @@ public class SubController {
                     //厚度
                     GCG.setOrder_Thk(decThkOrd);
 
+                    //标准
+                    GCG.setSG_STD(GCG.getLtInfoGPreOrder().get(0).getInfoPmProContProdAttrDO().getSgStd());
+
                     //压缩比
                     BigDecimal decThkRate =decThkOrd.divide(SInfo.getSlabActThk(), 2, RoundingMode.HALF_UP);
 
@@ -1090,6 +1089,8 @@ public class SubController {
                     //厚度
                     GCG.setThk(decThk);
 
+
+
                     //切边
                     GCG.setWid_Add(intTrimWid);
 
@@ -1113,12 +1114,17 @@ public class SubController {
         synchronized (gltGCal2Grp) {
             gltGCalGrp.parallelStream().forEach(e -> {
 
-                gltGCalGrp.parallelStream().forEach(f -> {
+                gltGCalGrp.forEach(f -> {
 
                     List<String> ltInfoOrder = new ArrayList<>();
 
                     //宽度满足要求和厚度相同
-                    if (f.getWid()+e.getWid()<4980 && e.getThk().equals(f.getThk())){
+                    if (f.getWid()+e.getWid()<4980
+                            && e.getThk().compareTo(f.getThk())==0
+                            && e.getSG_STD().equals(f.getSG_STD())
+                            && e.getThickTolMin().compareTo(f.getThickTolMin())==0
+                            && e.getThickTolMax().compareTo(f.getThickTolMax())==0
+                    ){
 
                         e.getLtInfoGPreOrder().forEach(i -> {
 
@@ -1241,6 +1247,9 @@ public class SubController {
                                         //相同组合信息
                                         GCG.getLtInfoGPreOrder().add(GPO);
 
+                                        //标准
+                                        GCG.setSG_STD(GPO.getInfoPmProContProdAttrDO().getSgStd());
+
                                         //宽度两个宽度的和
                                         int maxWidth = GPO.getLtInfoCombGPreOrder().stream()
                                                 .mapToInt(GComBOrder::getWid)
@@ -2179,7 +2188,7 @@ public class SubController {
         List<GGrpCalRslt>  ltTempGrp = new CopyOnWriteArrayList<>();
 
         //交叉分组 .parallelStream() .parallelStream()
-        gltGCalGrp.forEach(e -> {
+        gltGCalGrp.parallelStream().forEach(e -> {
 
             gltGCalGrp.forEach(f -> {
 
@@ -2190,7 +2199,13 @@ public class SubController {
                         return;
                     }
                     //e和f的宽度差绝对值小于500，宽度合小于4980，厚度相同
-                    if (Math.abs(e.getWid() - f.getWid()) <500 && e.getWid() + f.getWid() < 4980 && e.getThk().compareTo(f.getThk()) == 0) {
+                    if (Math.abs(e.getWid() - f.getWid()) <500
+                            && e.getWid() + f.getWid() < 4980
+                            && e.getThk().compareTo(f.getThk()) == 0
+                            && e.getSG_STD().equals(f.getSG_STD())
+                            && e.getThickTolMin().compareTo(f.getThickTolMin()) == 0
+                            && e.getThickTolMax().compareTo(f.getThickTolMax()) == 0
+                    ) {
 
                         //实例化计算结果数组
                         GCalGrp GCP1=e;