|
@@ -728,18 +728,22 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
|
|
|
//根据订单ID查找需求里面的承运范围和物资ID、物资品类ID
|
|
|
try {
|
|
|
Map<String,Object> priceMap = omstruckOrderSeparateMapper.getPriceInfo(orderId);
|
|
|
- Map<String,Object> priceValueMap = null;
|
|
|
+ Map<String,Object> priceValueMap = new HashMap<>();
|
|
|
+ Map<String,Object> priceValueMap1 = new HashMap<>();
|
|
|
+
|
|
|
if(priceMap != null){
|
|
|
if(priceMap.get("rangeId") == null) {
|
|
|
priceMap.put("rangeId",1);
|
|
|
}
|
|
|
- priceValueMap = amsFeign.getInwardPriceBy(priceMap);
|
|
|
- }
|
|
|
- if(priceValueMap != null){
|
|
|
- priceValueMap.put("netWeight", resultNetWeight);
|
|
|
- priceValueMap.put("orderId",orderId);
|
|
|
- RESTfulResult resTfulResult = bmsTruckFeign.addDetailsOrder(priceValueMap);
|
|
|
+ priceValueMap1 = amsFeign.getInwardPriceBy(priceMap);
|
|
|
+ if(priceValueMap1 != null) {
|
|
|
+ priceValueMap.putAll(priceValueMap1);
|
|
|
+ }
|
|
|
}
|
|
|
+ priceValueMap.put("netWeight", resultNetWeight);
|
|
|
+ priceValueMap.put("orderId",orderId);
|
|
|
+ RESTfulResult resTfulResult = bmsTruckFeign.addDetailsOrder(priceValueMap);
|
|
|
+
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
System.out.println(e.getMessage());
|