空指针
This commit is contained in:
parent
04f844cf93
commit
648bd55e7a
|
|
@ -231,12 +231,14 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
|
|||
}
|
||||
BigDecimal changeStock = conInfos.getStockNumber();
|
||||
//副单位的实际修改值
|
||||
if(StringUtils.isNotBlank(conInfos.getUnit())){
|
||||
if (StringUtils.isNotBlank(conInfos.getUnit())) {
|
||||
info.setDefaultUnit(conInfos.getUnit());
|
||||
if(conInfos.getUnit().equals(info.getConUnitTwo())){
|
||||
if (conInfos.getUnit().equals(info.getConUnitTwo())) {
|
||||
changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP);
|
||||
}
|
||||
}else if(info.getConUnitTwo().equals(info.getDefaultUnit())) {
|
||||
} else if (StringUtils.isNotBlank(info.getConUnitTwo())
|
||||
&& StringUtils.isNotBlank(info.getDefaultUnit())
|
||||
&& info.getConUnitTwo().equals(info.getDefaultUnit())) {
|
||||
info.setDefaultUnit(info.getConUnitTwo());
|
||||
changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue