|
@@ -184,7 +184,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
|
|
Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
|
|
Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
|
|
int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
|
|
int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
|
|
String capacityNumber = (String) mesMap.get("capacityNumber");
|
|
String capacityNumber = (String) mesMap.get("capacityNumber");
|
|
- if(orderType == 11){
|
|
|
|
|
|
+ if(orderType == 11 || orderType == 15 || orderType == 16){
|
|
return orderType11Use(map, mesMap,capacityNumber);
|
|
return orderType11Use(map, mesMap,capacityNumber);
|
|
}else if(orderType == 21){
|
|
}else if(orderType == 21){
|
|
return tmstruckEnfactoryResultService.orderType21Use(map, orderNumber, DataChange.dataToBigDecimal(mesMap.get("orderId")));
|
|
return tmstruckEnfactoryResultService.orderType21Use(map, orderNumber, DataChange.dataToBigDecimal(mesMap.get("orderId")));
|