From e3f2d7fc6490c465ea6c7ed83ded226e9deb406a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Fri, 5 Jul 2024 09:49:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=80=97=E6=9D=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/ysk/cashier/cons/domain/ViewConSku.java | 9 +++++++++ .../cashier/cons/repository/TbConsInfoRepository.java | 3 +++ .../cashier/cons/repository/TbConsTypeRepository.java | 2 ++ .../cn/ysk/cashier/cons/rest/TbConsTypeController.java | 2 +- .../cn/ysk/cashier/cons/service/TbConsTypeService.java | 2 +- .../cn/ysk/cashier/cons/service/dto/ViewConSkuDto.java | 3 +++ .../cashier/cons/service/impl/TbConsInfoServiceImpl.java | 6 ++++++ .../cashier/cons/service/impl/TbConsTypeServiceImpl.java | 9 ++++++++- 8 files changed, 33 insertions(+), 3 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConSku.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConSku.java index 12a9f517..11ba8f04 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConSku.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConSku.java @@ -23,6 +23,7 @@ import javax.persistence.*; import javax.validation.constraints.*; import java.math.BigDecimal; import java.io.Serializable; +import java.sql.Timestamp; /** * @author admin @@ -94,6 +95,14 @@ public class ViewConSku implements Serializable { @ApiModelProperty(value = "单价") private String price; + + @Column(name = "`create_time`") + @ApiModelProperty(value = "创建时间") + private Timestamp createTime; + + + + public void copy(ViewConSku source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } 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 64e204c9..772d5000 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 @@ -10,4 +10,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; * @date 2024-06-22 **/ public interface TbConsInfoRepository extends JpaRepository, JpaSpecificationExecutor { + + + int countByConCode(String conCode); } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsTypeRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsTypeRepository.java index 23cd9dca..fafa597f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsTypeRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsTypeRepository.java @@ -10,4 +10,6 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; * @date 2024-06-22 **/ public interface TbConsTypeRepository extends JpaRepository, JpaSpecificationExecutor { + + int countByConTypeCode(String conTypeCode); } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsTypeController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsTypeController.java index f7db48a3..425593e5 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsTypeController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsTypeController.java @@ -44,7 +44,7 @@ public class TbConsTypeController { @PostMapping @Log("新增耗材类型") @ApiOperation("新增耗材类型") - public ResponseEntity createTbConsType(@Validated @RequestBody TbConsType resources){ + public ResponseEntity createTbConsType(@Validated @RequestBody TbConsType resources) throws Exception { resources.setCreateTime(new Timestamp(System.currentTimeMillis())); return new ResponseEntity<>(tbConsTypeService.create(resources),HttpStatus.CREATED); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsTypeService.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsTypeService.java index 47033c98..41595b7d 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsTypeService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsTypeService.java @@ -42,7 +42,7 @@ public interface TbConsTypeService { * @param resources / * @return TbConsTypeDto */ - TbConsTypeDto create(TbConsType resources); + TbConsTypeDto create(TbConsType resources) throws Exception; /** * 编辑 diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConSkuDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConSkuDto.java index a95d0968..19248e5b 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConSkuDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConSkuDto.java @@ -18,6 +18,7 @@ package cn.ysk.cashier.cons.service.dto; import lombok.Data; import java.math.BigDecimal; import java.io.Serializable; +import java.sql.Timestamp; /** * @author admin @@ -66,5 +67,7 @@ public class ViewConSkuDto implements Serializable { private String price; + private Timestamp createTime; + } \ 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 67ece8fe..88511272 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 @@ -97,6 +97,12 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { throw new Exception("不存在的耗材类型"); } + + + int count= tbConsInfoRepository.countByConCode(resources.getConCode()); + if(count>0){ + throw new Exception("耗材代码不允许重复"); + } resources.setConTypeName(tbConsType.getConTypeName()); resources.setLasterInStock(BigDecimal.ZERO); resources.setStockNumber(BigDecimal.ZERO); 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 de7b7075..fb789d33 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 @@ -56,7 +56,14 @@ public class TbConsTypeServiceImpl implements TbConsTypeService { @Override @Transactional(rollbackFor = Exception.class) - public TbConsTypeDto create(TbConsType resources) { + public TbConsTypeDto create(TbConsType resources) throws Exception { + + + int count= tbConsTypeRepository.countByConTypeCode(resources.getConTypeCode()); + if(count>0){ + throw new Exception("耗材类型代码不允许重复"); + } + return tbConsTypeMapper.toDto(tbConsTypeRepository.save(resources)); }