commit for pull

ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java

@@ -350,6 +350,7 @@ public class KukaJoinThread implements ApplicationRunner {
                         //出现混档
                         boxId = getBoxId(bySubId.getSapMaterial());
                     }else {
+                        //正常情况
                         boxId = getBoxId(bySubId.getSapMaterial());
                     }
 

ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java

@@ -130,7 +130,7 @@ public class WoPackagingBoxSubstrateController {
     @PostMapping("/powerReport")
     public Result<PowerReportVo> powerReport(@RequestBody PowerReportQueryParam queryParam){
         List<PowerReportDTO> powerReportDTOS = boxServiceBiz.powerReport(queryParam);
-
+        System.out.println(powerReportDTOS.toString());
         PowerReportVo powerReportVo = new PowerReportVo();
         Float totalLevelPower = new Float(0);
         Float totalCompensatePower = new Float(0);