2025-03-22

XG_Project1/src/main/java/com/xisc/pm/api/controller/v1/SubController.java

@@ -228,7 +228,7 @@ public class SubController {
     @ApiOperation("数据处理")
     @PostMapping("/SubData1")
     @Permission(level = ResourceLevel.ORGANIZATION)
-    public JsonData SubData1( PmSubHis dtoListpr, @PathVariable Long organizationId) {
+    public JsonData SubData1(@RequestBody PmSubHis dtoListpr, @PathVariable Long organizationId) {
         SecurityTokenHelper.validTokenIgnoreInsert(dtoListpr);
         String strSlab = dtoListpr.getSlabNo();
         SubParams subParams = new SubParams();
@@ -324,7 +324,7 @@ public class SubController {
     @ApiOperation("数据处理")
     @PostMapping("/SubData")
     @Permission(level = ResourceLevel.ORGANIZATION)
-    public JsonData SubData( PmSubHis pmSubHis, @PathVariable Long organizationId) {
+    public JsonData SubData(@RequestBody PmSubHis pmSubHis, @PathVariable Long organizationId) {
         SecurityTokenHelper.validTokenIgnoreInsert(pmSubHis);
         String strSlab = pmSubHis.getSlabNo();
 
@@ -337,10 +337,10 @@ public class SubController {
         SubParams subParams = new SubParams();
         subParams.setSlabNo(strSlab);
         //测试阶段需要指定板坯号
-//        if (strSlab==null || strSlab=="")
+        if (strSlab==null || strSlab=="")
-//        {
+        {
-//            return null;
+            return null;
-//        }
+        }
         //获取所有数据
         GetDataInfo(subParams);
 
@@ -349,8 +349,6 @@ public class SubController {
 
         logger.info("***初次分组数量***  " + gltGrpOrderFir.size());
 
-
-
         //被使用的订单数据实例化
         plistOrdHis = new ArrayList<>();
 
@@ -412,6 +410,7 @@ public class SubController {
                         }
 
                         logger.info("***二次分组1数量***  " + gltGCalGrp.size());
+
                         //执行日志保存
                         subLogStr += "-----二次分组1数量：" + gltGCalGrp.size();
 
@@ -2755,8 +2754,9 @@ public class SubController {
                 .filter(g -> Objects.nonNull(g)
                         && Objects.nonNull(g.getIntUseFlg())
                         && g.getIntUseFlg() == 1
-                        && g.getLtActInfoGPreOrder().stream().anyMatch(m->m.getCombinationFlag()==1)
+//                        && g.getLtActInfoGPreOrder().stream().anyMatch(m->m.getCombinationFlag()==1)
-                        && g.getLtActInfoGPreOrder().stream().anyMatch(m->m.getCombinationFlag()==0))
+//                        && g.getLtActInfoGPreOrder().stream().anyMatch(m->m.getCombinationFlag()==0)
+                )
                 .collect(Collectors.toList());
 
         // 找到重量最大成材率最大的数据