耗材入库 单位填充2

This commit is contained in:
wangw 2024-11-27 14:18:11 +08:00
parent 0550f55a26
commit f90b4ec109
1 changed files with 7 additions and 7 deletions

View File

@ -236,13 +236,13 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
if (conInfos.getUnit().equals(info.getConUnitTwo())) { if (conInfos.getUnit().equals(info.getConUnitTwo())) {
changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP); changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP);
} }
} else if (StringUtils.isNotBlank(info.getConUnitTwo()) } else if(StringUtils.isNotBlank(info.getDefaultUnit())){
&& StringUtils.isNotBlank(info.getDefaultUnit()) info.setDefaultUnit(info.getDefaultUnit());
&& info.getConUnitTwo().equals(info.getDefaultUnit())) { conInfos.setUnit(info.getDefaultUnit());
info.setDefaultUnit(info.getConUnitTwo()); if(StringUtils.isNotBlank(info.getConUnitTwo())&& info.getConUnitTwo().equals(info.getDefaultUnit())){
conInfos.setUnit(info.getConUnitTwo()); changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP);
changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP); }
}else { } else {
info.setDefaultUnit(info.getConUnit()); info.setDefaultUnit(info.getConUnit());
conInfos.setUnit(info.getConUnit()); conInfos.setUnit(info.getConUnit());
} }