|
@@ -184,8 +184,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
|
|
i += utilsService.closeOrderNormally(map);
|
|
i += utilsService.closeOrderNormally(map);
|
|
// 判断是否要自动派单
|
|
// 判断是否要自动派单
|
|
Map<String,Object> mapValue = omsFeign.getSaleAllMessages(orderId.intValue());
|
|
Map<String,Object> mapValue = omsFeign.getSaleAllMessages(orderId.intValue());
|
|
- BigDecimal closeStatus = DataChange.dataToBigDecimal(mapValue.get("closeStatus"));
|
|
|
|
- if (closeStatus.intValue() == 0) {
|
|
|
|
|
|
+ Object closeStatus = mapValue.get("closeStatus");
|
|
|
|
+ if (closeStatus != null && DataChange.dataToBigDecimal(closeStatus).intValue() == 0) {
|
|
amsFeign.dispatchTruckOrderByCarrier(mapValue);
|
|
amsFeign.dispatchTruckOrderByCarrier(mapValue);
|
|
}
|
|
}
|
|
break;
|
|
break;
|