luobang 2 years ago
parent
commit
8341866a91

+ 2 - 0
src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -457,6 +457,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 //如果取出来的皮重 大于 传进来的皮重   则需要调换路段顺序号
                 tmstruckWeightResult.setGrossSegmentSqe(DataChange.dataToBigDecimal(twoMap.get("tareSegmentSqe")));
                 tmstruckWeightResult.setTareSegmentSqe(new BigDecimal(sqe));
+            }else{
+                tmstruckWeightResult.setGrossSegmentSqe(new BigDecimal(sqe));
             }
             try {
                 addWeightResult(tmstruckWeightResult, map);

+ 2 - 2
src/main/resources/application-dev.yml

@@ -9,11 +9,11 @@ spring:
 
 openfeign:
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   imFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   BmsTruckFeign:
     url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8009}
 server:

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/join
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8