From 2ed9bb48ecf476b95e725efb916a92231c7227c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Thu, 11 Jul 2024 15:43:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=97=E6=9D=90=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cons/repository/TbConsInfoRepository.java | 4 +++ .../service/impl/TbConsInfoServiceImpl.java | 16 +++++++----- .../service/impl/TbConsTypeServiceImpl.java | 26 ++++++++++++------- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoRepository.java index 772d5000..500c1f45 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoRepository.java @@ -4,6 +4,8 @@ import cn.ysk.cashier.cons.domain.TbConsInfo; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import java.util.List; + /** * @website https://eladmin.vip * @author admin @@ -13,4 +15,6 @@ public interface TbConsInfoRepository extends JpaRepository int countByConCode(String conCode); + + List findByConTypeId(Integer typeId); } \ No newline at end of file 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 030cb50e..100b1f35 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 @@ -64,6 +64,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { private final TbProductStockOperateRepository tbProductStockOperateRepository; + @Override public Map queryAll(TbConsInfoQueryCriteria criteria, Pageable pageable) { Page page = tbConsInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable); @@ -94,11 +95,13 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { } - int count = tbConsInfoRepository.countByConCode(resources.getConCode()); - if (count > 0) { - throw new Exception("耗材代码不允许重复"); - } +// int count = tbConsInfoRepository.countByConCode(resources.getConCode()); +// if (count > 0) { +// throw new Exception("耗材代码不允许重复"); +// } + + resources.setConCode(UUID.randomUUID().toString()); resources.setConTypeName(tbConsType.getConTypeName()); resources.setLasterInStock(BigDecimal.ZERO); resources.setStockNumber(BigDecimal.ZERO); @@ -118,7 +121,6 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { } - tbConsInfo.setConCode(resources.getConCode()); tbConsInfo.setConName(resources.getConName()); tbConsInfo.setPrice(resources.getPrice()); tbConsInfo.setConUnit(resources.getConUnit()); @@ -302,8 +304,10 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { stockOperate.setBatchNumber(""); stockOperate.setStockSnap(array.toJSONString()); tbProductStockOperateRepository.save(stockOperate); + } - + public static void main(String[] args){ + System.out.println(UUID.randomUUID().toString()); } } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsTypeServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsTypeServiceImpl.java index fb789d33..d0a78bf7 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsTypeServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsTypeServiceImpl.java @@ -1,6 +1,8 @@ package cn.ysk.cashier.cons.service.impl; +import cn.ysk.cashier.cons.domain.TbConsInfo; import cn.ysk.cashier.cons.domain.TbConsType; +import cn.ysk.cashier.cons.repository.TbConsInfoRepository; import cn.ysk.cashier.utils.FileUtil; import cn.ysk.cashier.utils.PageUtil; import cn.ysk.cashier.utils.QueryHelp; @@ -15,12 +17,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; + +import java.util.*; import java.io.IOException; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.LinkedHashMap; /** * @website https://eladmin.vip @@ -35,6 +35,8 @@ public class TbConsTypeServiceImpl implements TbConsTypeService { private final TbConsTypeRepository tbConsTypeRepository; private final TbConsTypeMapper tbConsTypeMapper; + private final TbConsInfoRepository tbConsInfoRepository; + @Override public Map queryAll(TbConsTypeQueryCriteria criteria, Pageable pageable){ Page page = tbConsTypeRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); @@ -59,11 +61,7 @@ public class TbConsTypeServiceImpl implements TbConsTypeService { public TbConsTypeDto create(TbConsType resources) throws Exception { - int count= tbConsTypeRepository.countByConTypeCode(resources.getConTypeCode()); - if(count>0){ - throw new Exception("耗材类型代码不允许重复"); - } - + resources.setConTypeCode(UUID.randomUUID().toString()); return tbConsTypeMapper.toDto(tbConsTypeRepository.save(resources)); } @@ -74,6 +72,16 @@ public class TbConsTypeServiceImpl implements TbConsTypeService { ValidationUtil.isNull( tbConsType.getId(),"TbConsType","id",resources.getId()); tbConsType.copy(resources); tbConsTypeRepository.save(tbConsType); + + List tbConsInfos=tbConsInfoRepository.findByConTypeId(tbConsType.getId()); + if(Objects.nonNull(tbConsInfos)){ + tbConsInfos.stream().forEach(it->{ + it.setConTypeName(resources.getConTypeName()); + }); + } + + tbConsInfoRepository.saveAll(tbConsInfos); + } @Override