'采购燃料'

src/main/java/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.java

@@ -18,7 +18,7 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     BigDecimal selectMaxId();
 
     //通过物资ID或运输订单ID查询计量实绩ID
-    Integer getWeightIdByMaterialIdAndOrderId(Map<String, Object> map);
+    BigDecimal getWeightIdByMaterialIdAndOrderId(Map<String, Object> map);
 
     //通过运输订单号和查询订单Id 和物资ID (针对单拼)
     Map<String, Object> getOrderIdAndMaterialIdByOrderNum(String orderNumber);

src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -187,7 +187,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 }
         }
         /*访问接口发送数据*/
-        return sendMesToMeasure(measureCommission);
+//        sendMesToMeasure(measureCommission);
+        return 1;
     }
 
     /**

src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -370,8 +370,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     public int updateWeightResult(Map<String, Object> map){
         TmstruckWeightResult tmstruckWeightResult = new TmstruckWeightResult();
         //通过(物资ID)和运输订单Id修改查找计量实绩ID
-        Integer id = tmstruckWeightResultMapper.getWeightIdByMaterialIdAndOrderId(map);
-        tmstruckWeightResult.setId(new BigDecimal(id));
+        BigDecimal id = tmstruckWeightResultMapper.getWeightIdByMaterialIdAndOrderId(map);
+        tmstruckWeightResult.setId(id);
         if(map.get("tarePlaceId") != null){ //如果皮重汽车衡不为空 更新皮重汽车衡
             tmstruckWeightResult.setResultTarePlaceId(DataChange.dataToBigDecimal(map.get("tarePlaceId")));
         }

src/main/resources/bootstrap.yml

@@ -16,30 +16,30 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:localhost:8078}
   BmsTruckFeign:
     url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   WmshBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:localhost:8070}
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8093}
+    url: ${WMSFEIGN_URL:172.16.33.162:8093}
   OmsFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   JoinFeign:
-    url: ${JOINFEIGN_URL:localhost:8066}
+    url: ${JOINFEIGN_URL:172.16.33.162:8066}
   QmsFeign:
-    url: ${QMSFEIGN_URL:localhost:8087}
+    url: ${QMSFEIGN_URL:localhost:8047}
   ImFeign:
-    url: ${IMFEIGN_URL:localhost:8055}
+    url: ${IMFEIGN_URL:172.16.33.162:8055}
 
 
 #eureka设置
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
 
   instance:
     prefer-ip-address: true

src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -1377,7 +1377,7 @@
     </select>
 
     <!--   通过物资Id和运输订单id 查询计量实绩Id -->
-    <select id="getWeightIdByMaterialIdAndOrderId" parameterType="java.util.Map" resultType="java.lang.Integer">
+    <select id="getWeightIdByMaterialIdAndOrderId" parameterType="java.util.Map" resultType="DECIMAL">
         select
         TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId"
         from OMSTRUCK_ORDER OO