diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java index 2dc9dea0..423171c7 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java @@ -236,12 +236,15 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { if (conInfos.getUnit().equals(info.getConUnitTwo())) { changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP); } - } else if (StringUtils.isNotBlank(info.getConUnitTwo()) - && StringUtils.isNotBlank(info.getDefaultUnit()) - && info.getConUnitTwo().equals(info.getDefaultUnit())) { - info.setDefaultUnit(info.getConUnitTwo()); - conInfos.setUnit(info.getConUnitTwo()); - changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP); + } else if(StringUtils.isNotBlank(info.getDefaultUnit())){ + info.setDefaultUnit(info.getDefaultUnit()); + conInfos.setUnit(info.getDefaultUnit()); + if(StringUtils.isNotBlank(info.getConUnitTwo())&& info.getConUnitTwo().equals(info.getDefaultUnit())){ + changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP); + } + } else { + info.setDefaultUnit(info.getConUnit()); + conInfos.setUnit(info.getConUnit()); } TbConsSuppFlow suppFlow = new TbConsSuppFlow();