|
|
@@ -598,7 +598,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
throw new Exception("已过磅，撤单失败！");
|
|
|
}
|
|
|
//如果是老区已进场或者内转，则删除计量委托
|
|
|
- if(omstruckOrderSeparateMapper.countEnFactory(orderId) > 0 || orderType==11 || orderType == 15 || orderType == 16){
|
|
|
+ if(orderType !=4 && omstruckOrderSeparateMapper.countEnFactory(orderId) > 0 || orderType==11 || orderType == 15 || orderType == 16){
|
|
|
//获取运输订单号
|
|
|
String orderNumber = (String) mesMap.get("orderNumber");
|
|
|
//撤销订单的同时删除计量数据
|
luobang