diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java index a5c50c38..44236cb4 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java @@ -66,9 +66,9 @@ public class TbConCheckServiceImpl implements TbConCheckService { throw new Exception("耗材信息不存在"); } - BigDecimal stonum=consInfo.getStockNumber().subtract(consInfo.getStockConsume()); - consInfo.setStockConsume(consInfo.getStockConsume().add(resources.getLpNum().negate())); + consInfo.setStockConsume(BigDecimal.ZERO); + consInfo.setStockNumber(resources.getStockNumber()); consInfo.setUpdateTime(new Timestamp(System.currentTimeMillis())); tbConsInfoRepository.save(consInfo); @@ -77,8 +77,8 @@ public class TbConCheckServiceImpl implements TbConCheckService { conCheck.setConInfoId(consInfo.getId()); conCheck.setConName(consInfo.getConName()); conCheck.setPrice(consInfo.getPrice()); - conCheck.setAcStockNumber(consInfo.getStockNumber().subtract(consInfo.getStockConsume())); - conCheck.setStockNumber(stonum); + conCheck.setAcStockNumber(resources.getStockNumber()); + conCheck.setStockNumber(resources.getStockNumber()); conCheck.setLpNum(resources.getLpNum()); conCheck.setLpAmount(consInfo.getPrice().multiply(resources.getLpNum())); conCheck.setCreateTime(new Timestamp(System.currentTimeMillis())); 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 191c0188..c7ba1027 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 @@ -184,18 +184,17 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { if (Objects.isNull(tbShopInfo)) { throw new Exception("店铺信息不存在"); } - TbShopPurveyor purveyor = tbShopPurveyorRepository.getById(resources.getSupplierId()); + + TbShopPurveyor purveyor=null; TbProductStockOperate stockOperate = new TbProductStockOperate(); - if (Objects.isNull(purveyor)) { - stockOperate.setPurveyorId(null); - stockOperate.setPurveyorName(null); - }else { - stockOperate.setPurveyorId(resources.getSupplierId().toString()); - stockOperate.setPurveyorName(purveyor.getPurveyorName()); + if(Objects.nonNull(resources.getSupplierId())){ + purveyor = tbShopPurveyorRepository.getById(resources.getSupplierId()); + if (Objects.nonNull(purveyor)) { + stockOperate.setPurveyorId(resources.getSupplierId().toString()); + stockOperate.setPurveyorName(purveyor.getPurveyorName()); + } } - - stockOperate.setShopId(tbShopInfo.getId().toString()); stockOperate.setStockSnap(""); stockOperate.setType(resources.getType().equals("in")?"cons_in":"cons_out");