|
|
@@ -9,7 +9,6 @@ import com.steerinfo.dil.model.*;
|
|
|
import com.steerinfo.dil.service.IAmsSaleOrderService;
|
|
|
import com.steerinfo.dil.util.*;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
-import org.apache.poi.ss.formula.functions.T;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.scheduling.annotation.Scheduled;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -2040,7 +2039,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
oldOldCapacityId = DataChange.dataToBigDecimal(oldCpacityIds.split(",")[0]);
|
|
|
}
|
|
|
//如果旧车号是取消，且取消的前一个车与该车相等,那么就将状态还原
|
|
|
- if (oldCapacityId.compareTo(new BigDecimal(35128)) == 0 && DataChange.dataToBigDecimal(mapValue.get("capacityId")).compareTo(oldOldCapacityId) == 0 ) {
|
|
|
+ if (oldOldCapacityId != null && oldCapacityId != null && oldCapacityId.compareTo(new BigDecimal(35128)) == 0 && DataChange.dataToBigDecimal(mapValue.get("capacityId")).compareTo(oldOldCapacityId) == 0 ) {
|
|
|
//判断该订单下有没有子实绩
|
|
|
BigDecimal resultId = amsSaleOrderMaterialMapper.selectEnFactory(DataChange.dataToBigDecimal(mapValue.get("orderId")));
|
|
|
if(resultId == null) {
|
luobang