1

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java

@@ -47,6 +47,9 @@ public class SubController {
     //计算结果数据
     private static List<GGrpCalRslt> gltGGrpCalRslt = new CopyOnWriteArrayList<>();
 
+
+
+
     private static int intOrdNum = 0;
 
     private static int intGrpNum = 0;
@@ -141,13 +144,15 @@ public class SubController {
                     //二次分组
                     SetGrpDataBySlab(p);
 
+                    logger.info("***二次分组数量***  " + gltGCalGrp.size());
+
                     if (gltGCalGrp.size()>0){
 
                         SetGroupCalRslt(p);
 
                     }
 
-                    logger.info("***二次分组数量***  " + gltGCalGrp.size());
+
 
                 }
         );
@@ -392,7 +397,41 @@ public class SubController {
      * */
     public void SetGrpDataBySlab(SlabInfoDO SInfo) {
 
-        gltGrpOrderFir.parallelStream().forEach(e -> {
+//        gltGrpOrderFir.parallelStream().forEach(e -> {
+//
+//            // gltGCalGrp 产生可计算分组
+//
+//            //压缩比  Compression ratio
+//
+//            //宽展比 Wide ratio
+//
+//            //钢种标准对比
+//
+//            GCalGrp GCG = new GCalGrp();
+//
+//            e.getLtInfoGPreOrder().parallelStream().forEach(f -> {
+//
+//                //化学成分  chemical composition
+//                if (!ChkChemical(SInfo, f)) {
+//                    return;
+//                }
+//                //低倍检测  low-power check
+//                if (!ChkLowPower(SInfo, f)) {
+//                    return;
+//                }
+//
+//                GCG.setLtInfoGPreOrder(new ArrayList<>());
+//                GCG.getLtInfoGPreOrder().add(f);//添加订单信息
+//            });
+//
+//            //存在订单，添加可计算分组
+//            if (GCG.getLtInfoGPreOrder().size() > 0) {
+//                gltGCalGrp.add(GCG);
+//            }
+//
+//        });
+
+        gltGrpOrderFir.forEach(e -> {
 
             // gltGCalGrp 产生可计算分组
 
@@ -403,8 +442,8 @@ public class SubController {
             //钢种标准对比
 
             GCalGrp GCG = new GCalGrp();
-
+            GCG.setLtInfoGPreOrder(new ArrayList<>());
-            e.getLtInfoGPreOrder().parallelStream().forEach(f -> {
+            e.getLtInfoGPreOrder().forEach(f -> {
 
                 //化学成分  chemical composition
                 if (!ChkChemical(SInfo, f)) {
@@ -415,7 +454,7 @@ public class SubController {
                     return;
                 }
 
-                GCG.setLtInfoGPreOrder(new ArrayList<>());
+//                GCG.setLtInfoGPreOrder(new ArrayList<>());
                 GCG.getLtInfoGPreOrder().add(f);//添加订单信息
             });