|
@@ -219,7 +219,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");
|
|
- String thisOrderId = (String) mesMap.get("orderId");
|
|
|
|
|
|
+ String thisOrderId = mesMap.get("orderId").toString();
|
|
String materialName = utilsMapper.getOrderMaterialByOrderId(thisOrderId);
|
|
String materialName = utilsMapper.getOrderMaterialByOrderId(thisOrderId);
|
|
mesMap.put("materialName", materialName);
|
|
mesMap.put("materialName", materialName);
|
|
if(orderType == 11 || orderType == 15 || orderType == 16){
|
|
if(orderType == 11 || orderType == 15 || orderType == 16){
|