Commit 609f1d2d4105b2d168f7aa6f23a23c2ca998c615

Authored by 潘钊
1 parent fed17f3c

update...

@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <groupId>com.bsth</groupId> 5 <groupId>com.bsth</groupId>
6 <artifactId>control_service_data_interface</artifactId> 6 <artifactId>control_service_data_interface</artifactId>
7 <version>0.0.1-SNAPSHOT</version> 7 <version>0.0.1-SNAPSHOT</version>
8 - <packaging>war</packaging> 8 + <packaging>jar</packaging>
9 9
10 <parent> 10 <parent>
11 <groupId>org.springframework.boot</groupId> 11 <groupId>org.springframework.boot</groupId>
src/main/java/com/bsth/ws_server/util/ScheduleCalculator.java
@@ -497,7 +497,7 @@ public class ScheduleCalculator { @@ -497,7 +497,7 @@ public class ScheduleCalculator {
497 int count = 0; 497 int count = 0;
498 498
499 for(ScheduleRealInfo sch : list){ 499 for(ScheduleRealInfo sch : list){
500 - if(sch.getBcType().equals("venting") && 500 + if((sch.getBcType().equals("venting") || sch.getBcType().equals("major")) &&
501 sch.getStatus() != -1) 501 sch.getStatus() != -1)
502 count ++; 502 count ++;
503 } 503 }
src/main/java/com/bsth/ws_server/waybill/entity/NH_waybillItem.java
@@ -32,7 +32,7 @@ public class NH_waybillItem { @@ -32,7 +32,7 @@ public class NH_waybillItem {
32 private Double m_dblSJJHLC; 32 private Double m_dblSJJHLC;
33 /** 出场里程 */ 33 /** 出场里程 */
34 private Double m_dblCCLC; 34 private Double m_dblCCLC;
35 - /** 进场路码 */ 35 + /** 进场里程 */
36 private Double m_dblJCLC; 36 private Double m_dblJCLC;
37 /** 空驶公里 */ 37 /** 空驶公里 */
38 private Double m_dblKSLC; 38 private Double m_dblKSLC;
src/main/resources/application-prod.properties
1 -server.port=9088 1 +server.port=9089
2 management.port= 9001 2 management.port= 9001
3 management.address= 127.0.0.1 3 management.address= 127.0.0.1
4 4
5 -spring.jpa.hibernate.ddl-auto= none 5 +spring.jpa.hibernate.ddl-auto= update
6 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy 6 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
7 #DATABASE 7 #DATABASE
8 spring.jpa.database= MYSQL 8 spring.jpa.database= MYSQL