|
@@ -394,21 +394,18 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
|
|
Map<String,Object>mapPrice = null;
|
|
Map<String,Object>mapPrice = null;
|
|
try {
|
|
try {
|
|
mapPrice = amsFeign.getInwardPriceBy(mapInfo);
|
|
mapPrice = amsFeign.getInwardPriceBy(mapInfo);
|
|
- } catch (Exception e) {
|
|
|
|
- e.printStackTrace();
|
|
|
|
- }
|
|
|
|
- if(mapPrice != null){
|
|
|
|
- mapPrice.put("orderId",orderId1);
|
|
|
|
- try {
|
|
|
|
|
|
+ if(mapPrice != null){
|
|
|
|
+ mapPrice.put("orderId",orderId1);
|
|
mapPrice.putAll(map);
|
|
mapPrice.putAll(map);
|
|
- Map<String, Object> stringObjectMap = bmsTruckFeign.addDetailsOrder(mapPrice);
|
|
|
|
|
|
+ Map<String, Object> stringObjectMap = bmsTruckFeign.addInwardDetailsOrder(mapPrice);
|
|
if (stringObjectMap==null){
|
|
if (stringObjectMap==null){
|
|
- throw new Exception("生成账单失败");
|
|
|
|
|
|
+ return -1;
|
|
}
|
|
}
|
|
- } catch (Exception e) {
|
|
|
|
- e.printStackTrace();
|
|
|
|
}
|
|
}
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ e.printStackTrace();
|
|
}
|
|
}
|
|
|
|
+
|
|
return i;
|
|
return i;
|
|
}
|
|
}
|
|
}
|
|
}
|