From 391b52b23a02ae61c7d531e3e58ac7bcbc76835d Mon Sep 17 00:00:00 2001 From: caixiang <939387484@qq.com> Date: Tue, 7 Mar 2023 13:47:24 +0800 Subject: [PATCH] commit for pull --- .../src/main/resources/application-dev.yml | 32 +++++++++---------- .../com/cnbm/dispatch/KukaJoinThread.java | 1 + .../WoPackagingBoxSubstrateController.java | 2 +- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/ym-gateway/src/main/resources/application-dev.yml b/ym-gateway/src/main/resources/application-dev.yml index cc956c6..da8f64c 100644 --- a/ym-gateway/src/main/resources/application-dev.yml +++ b/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 \ No newline at end of file +# 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 \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java b/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java index ce5f864..62b99c8 100644 --- a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java +++ b/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()); } diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java index ac18e27..b7a74ef 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java @@ -130,7 +130,7 @@ public class WoPackagingBoxSubstrateController { @PostMapping("/powerReport") public Result powerReport(@RequestBody PowerReportQueryParam queryParam){ List powerReportDTOS = boxServiceBiz.powerReport(queryParam); - + System.out.println(powerReportDTOS.toString()); PowerReportVo powerReportVo = new PowerReportVo(); Float totalLevelPower = new Float(0); Float totalCompensatePower = new Float(0);