commit for pull

ym-gateway/src/main/resources/application-dev.yml

@@ -2,14 +2,14 @@ spring:
   datasource:
       driver-class-name: com.mysql.cj.jdbc.Driver
       #MySQL-local
-#      url: jdbc:mysql://10.0.1.249:3306/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#      username: cigs4
-#      password: 1qazxsw2
+      url: jdbc:mysql://10.0.1.249:3306/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+      username: cigs4
+      password: 1qazxsw2
 
       #MySQL-remote
-      url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-      username: root
-      password: 1qaz@WSX3edc$RFV
+#      url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#      username: root
+#      password: 1qaz@WSX3edc$RFV
       #      #Oracle
       #      driver-class-name: oracle.jdbc.OracleDriver
       #      url: jdbc:oracle:thin:@192.168.10.10:1521:xe
@@ -66,15 +66,15 @@ dynamic:
 #      username: root
 #      password: 1qaz@WSX3edc$RFV
     ## camline系统 - remote
-    camline:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-      username: root
-      password: 1qaz@WSX3edc$RFV
-#
-    #camline系统 - local
 #    camline:
 #      driver-class-name: com.mysql.cj.jdbc.Driver
-#      url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#      username: offline_data
-#      password: tpvmfab4
+#      url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#      username: root
+#      password: 1qaz@WSX3edc$RFV
+#
+    #camline系统 - local
+    camline:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+      username: offline_data
+      password: tpvmfab4

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);