czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
Tankaikai 2024-11-27 14:21:28 +08:00
parent 7b1e719f4b f90b4ec109
commit 27e0c8aa78
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
View File

@ -236,12 +236,15 @@ 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 {
info.setDefaultUnit(info.getConUnit());
conInfos.setUnit(info.getConUnit());
} }
TbConsSuppFlow suppFlow = new TbConsSuppFlow(); TbConsSuppFlow suppFlow = new TbConsSuppFlow();