|
@@ -886,7 +886,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
zjxlUtilMapper.insertSubCapacity(zjxlUtilMapper.getSubCapacityMaxId(), capacityNumber, DataChange.dataToBigDecimal(orderMessage.get("resultTotalId")));
|
|
zjxlUtilMapper.insertSubCapacity(zjxlUtilMapper.getSubCapacityMaxId(), capacityNumber, DataChange.dataToBigDecimal(orderMessage.get("resultTotalId")));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if(orderType == 11 || orderType == 15 || orderType == 16){
|
|
|
|
|
|
+ if(orderType == 11 || orderType == 15 || orderType == 16 ){
|
|
//判断是否为化专线厂区内转
|
|
//判断是否为化专线厂区内转
|
|
Map<String, Object> inwardLine = omstruckOrderMapper.isInwardLine(orderId);
|
|
Map<String, Object> inwardLine = omstruckOrderMapper.isInwardLine(orderId);
|
|
String rangeValue = (String) inwardLine.get("rangeValue");
|
|
String rangeValue = (String) inwardLine.get("rangeValue");
|
|
@@ -903,7 +903,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
if (!"200".equals(mcMap.get("code"))) {
|
|
if (!"200".equals(mcMap.get("code"))) {
|
|
throw new RuntimeException("委托发送失败!");
|
|
throw new RuntimeException("委托发送失败!");
|
|
}
|
|
}
|
|
- }else if(orderType!=21&&orderType!=25){
|
|
|
|
|
|
+ }else if(orderType!=21&&orderType!=25 && orderType!=26){
|
|
//添加各个实绩
|
|
//添加各个实绩
|
|
omstruckOrderSeparateService.addAllSonResult(orderMessage);
|
|
omstruckOrderSeparateService.addAllSonResult(orderMessage);
|
|
if (orderType==19){
|
|
if (orderType==19){
|