格式化数据

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

@@ -67,7 +67,6 @@ public class SubController {
     private static List<PmCmdSmallPltDO> pmCmdSmallPltDOList = new ArrayList<>();
 
 
-
     private static int intOrdNum = 0;
 
     private static int intGrpNum = 0;
@@ -188,7 +187,7 @@ public class SubController {
         );
         logger.info("*****处理结束*****");
         logger.info("");
-        logger.info("-");
+
         return JsonData.buildSuccess();
     }
 
@@ -429,40 +428,6 @@ public class SubController {
      * */
     public void SetGrpDataBySlab(SlabInfoDO SInfo) {
 
-//        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.parallelStream().forEach(e -> {
 
             // gltGCalGrp 产生可计算分组
@@ -578,12 +543,10 @@ public class SubController {
         List<QdToLineupResultCheDO> ltLrc = new ArrayList<>();
         int intOrd = plistQdToLineupResultCheDO.stream().filter(p -> p.getOrderNo().equals(null)).collect(Collectors.toList()).size();
         int intRX = plistQdToLineupResultCheDO.stream().filter(p -> p.getCheType().equals(null)).collect(Collectors.toList()).size();
-        if (intOrd>0 || intRX>0)
-        {
+        if (intOrd > 0 || intRX > 0) {
             logger.info("*************************化学成分订单号：{}-{}-{}", GrpOrd.getOrderNo(), intOrd, intRX);
         }
-if (plistQdToLineupResultCheDO==null)
-{
+        if (plistQdToLineupResultCheDO == null) {
             logger.info("*************************化学成分订单号：{}-{}-{}", GrpOrd.getOrderNo(), intOrd, intRX);
         }
         if (plistQdToLineupResultCheDO.stream().anyMatch(p -> p.getOrderNo().equals(GrpOrd.getOrderNo()) && p.getCheType().equals("RX"))) {
@@ -1231,8 +1194,7 @@ if (plistQdToLineupResultCheDO==null)
             gltGGrpCalRslt.add(GGCR);
         });
 
-        if (gltGGrpCalRslt.size()==0)
-        {
+        if (gltGGrpCalRslt.size() == 0) {
             return;
         }
         //分组计算
@@ -1256,8 +1218,7 @@ if (plistQdToLineupResultCheDO==null)
 
                 int intOrdCount = p.getCal_Len() / e.getLen();
 
-                if(ltOrder.stream().filter(f->f.equals(e.getOrderNo())).count()==intOrdCount)
-                {
+                if (ltOrder.stream().filter(f -> f.equals(e.getOrderNo())).count() == intOrdCount) {
                     return;
                 }
                 ltOrder.add(e.getOrderNo());//添加订单号