From 0550f55a2692f511923c511c6e93f88542b8085d Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 27 Nov 2024 14:08:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=85=A5=E5=BA=93=20?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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..33c5d66f 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 @@ -242,6 +242,9 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { info.setDefaultUnit(info.getConUnitTwo()); conInfos.setUnit(info.getConUnitTwo()); 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(); From f90b4ec109ffd2713a292d75f3ff79213818a0da Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 27 Nov 2024 14:18:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=85=A5=E5=BA=93=20?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=A1=AB=E5=85=852?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cons/service/impl/TbConsInfoServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 33c5d66f..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,13 +236,13 @@ 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 { + } 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()); }