瀏覽代碼

'修改配置文件'

HUJIANGUO 3 年之前
父節點
當前提交
858d8c4311

+ 5 - 2
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -1642,6 +1642,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         BigDecimal materialId = new BigDecimal((Integer) mapValue.get("materialId"));
         BigDecimal orderType = new BigDecimal((Integer) mapValue.get("orderType"));
         BigDecimal lineId = new BigDecimal((Integer) mapValue.get("lineId"));
+        Integer planId = (Integer) mapValue.get("planId");
         int result = 0;
         for (Map<String, Object> map : mapList) {
             OmstruckOrder omstruckOrder = new OmstruckOrder();
@@ -1650,7 +1651,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
             String capacityNumber = (String)map.get("capacityNumber");
             BigDecimal capacityId = omstruckOrderMapper.getCapacityId(capacityNumber);
-            BigDecimal materialWeight = DataChange.dataToBigDecimal(map.get("materialWeight"));
+            BigDecimal materialWeight = DataChange.dataToBigDecimal(map.get("orderMaterialWeight"));
             String unloadPoint = (String) map.get("unloadPoint");
             BigDecimal unloadPointId = omstruckOrderMapper.getUnloadPointId(unloadPoint);
 //            Date orderEntryTime = new Date((Long) map.get("orderEntryTime"));
@@ -1678,7 +1679,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             //新增实绩总表关联订单 feign 调用truckTms
             map.put("orderId", omstruckOrder.getOrderId());
             tmsTruckFeign.addTotalResult(map);
-//            amsFeign.updateMaterial(map); //更改运输计划子表 增加已分配重量 减少未分配重量  feign调用ams
+            //更改运输计划子表 增加已分配重量 减少未分配重量  feign调用ams
+            map.put("planId",planId);
+            amsFeign.updateMaterial(map);
         }
         return result;
     }

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

@@ -43,13 +43,13 @@ redis:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   AmsFeign:
     url: ${AMSFEIGN_URL:localhost:8079}
-  Im:
-    url: ${AMSFEIGN_URL:172.16.33.161:8099}
+  ImFeign:
+    url: ${IMFEIGN_URL:localhost:8099}
 
 mybatis:
   type-aliases-package: com.steerinfo.dil.model