From 884e1289e53428f7307b1375aa565fd857f9e7fa Mon Sep 17 00:00:00 2001 From: starrysky <838252223@qq.com> Date: Tue, 12 Nov 2019 14:17:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E7=AE=A1=E7=90=86=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/QualityCheckSheet.java | 52 +++++++++++++ .../domain/QualityCheckSheetProduct.java | 65 +++++++++++++++++ .../QualityCheckSheetProductRepository.java | 12 +++ .../QualityCheckSheetRepository.java | 12 +++ .../rest/QualityCheckSheetController.java | 61 ++++++++++++++++ .../QualityCheckSheetProductController.java | 61 ++++++++++++++++ .../QualityCheckSheetProductService.java | 64 ++++++++++++++++ .../service/QualityCheckSheetService.java | 64 ++++++++++++++++ .../service/dto/QualityCheckSheetDTO.java | 34 +++++++++ .../dto/QualityCheckSheetProductDTO.java | 43 +++++++++++ ...QualityCheckSheetProductQueryCriteria.java | 13 ++++ .../dto/QualityCheckSheetQueryCriteria.java | 13 ++++ .../QualityCheckSheetProductServiceImpl.java | 73 +++++++++++++++++++ .../impl/QualityCheckSheetServiceImpl.java | 73 +++++++++++++++++++ .../mapper/QualityCheckSheetMapper.java | 16 ++++ .../QualityCheckSheetProductMapper.java | 16 ++++ 16 files changed, 672 insertions(+) create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/domain/QualityCheckSheet.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/domain/QualityCheckSheetProduct.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/repository/QualityCheckSheetProductRepository.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/repository/QualityCheckSheetRepository.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/rest/QualityCheckSheetController.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/rest/QualityCheckSheetProductController.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/QualityCheckSheetProductService.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/QualityCheckSheetService.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetDTO.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetProductDTO.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetProductQueryCriteria.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetQueryCriteria.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetProductServiceImpl.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetServiceImpl.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/mapper/QualityCheckSheetMapper.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/mapper/QualityCheckSheetProductMapper.java diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/domain/QualityCheckSheet.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/domain/QualityCheckSheet.java new file mode 100644 index 00000000..095d3626 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/domain/QualityCheckSheet.java @@ -0,0 +1,52 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.domain; + +import lombok.Data; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import javax.persistence.*; +import java.sql.Timestamp; +import java.io.Serializable; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +@Entity +@Data +@Table(name="quality_check_sheet") +public class QualityCheckSheet implements Serializable { + + // 主键 + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Long id; + + @Column(name = "create_time") + private Timestamp createTime; + + @Column(name = "update_time") + private Timestamp updateTime; + + @Column(name = "status") + private Integer status; + + // 制单人 + @Column(name = "make_people_id") + private Long makePeopleId; + + // 制单人姓名 + @Column(name = "make_people_name") + private String makePeopleName; + + // 质量检验单单据编号 + @Column(name = "quality_cheek_sheet_code") + private String qualityCheekSheetCode; + + @Column(name = "remark") + private String remark; + + public void copy(QualityCheckSheet source){ + BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/domain/QualityCheckSheetProduct.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/domain/QualityCheckSheetProduct.java new file mode 100644 index 00000000..7cfb63c2 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/domain/QualityCheckSheetProduct.java @@ -0,0 +1,65 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.domain; + +import lombok.Data; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import javax.persistence.*; +import java.sql.Timestamp; +import java.io.Serializable; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +@Entity +@Data +@Table(name="quality_check_sheet_product") +public class QualityCheckSheetProduct implements Serializable { + + // 主键 + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Long id; + + @Column(name = "create_time") + private Timestamp createTime; + + @Column(name = "update_time") + private Timestamp updateTime; + + @Column(name = "status") + private Integer status; + + // 所属质量检验单 + @Column(name = "quality_check_sheet_id") + private Long qualityCheckSheetId; + + @Column(name = "product_code") + private String productCode; + + @Column(name = "product_id") + private Long productId; + + @Column(name = "product_name") + private String productName; + + @Column(name = "remark") + private String remark; + + // 产品个数 + @Column(name = "product_number") + private Integer productNumber; + + // 合格个数 + @Column(name = "qualified_number") + private Integer qualifiedNumber; + + // 报废数量 + @Column(name = "scrap_number") + private Integer scrapNumber; + + public void copy(QualityCheckSheetProduct source){ + BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/repository/QualityCheckSheetProductRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/repository/QualityCheckSheetProductRepository.java new file mode 100644 index 00000000..e220b084 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/repository/QualityCheckSheetProductRepository.java @@ -0,0 +1,12 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.repository; + +import me.zhengjie.modules.wms.qualityCheckSheet.domain.QualityCheckSheetProduct; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +public interface QualityCheckSheetProductRepository extends JpaRepository, JpaSpecificationExecutor { +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/repository/QualityCheckSheetRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/repository/QualityCheckSheetRepository.java new file mode 100644 index 00000000..dea2aea2 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/repository/QualityCheckSheetRepository.java @@ -0,0 +1,12 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.repository; + +import me.zhengjie.modules.wms.qualityCheckSheet.domain.QualityCheckSheet; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +public interface QualityCheckSheetRepository extends JpaRepository, JpaSpecificationExecutor { +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/rest/QualityCheckSheetController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/rest/QualityCheckSheetController.java new file mode 100644 index 00000000..52695a38 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/rest/QualityCheckSheetController.java @@ -0,0 +1,61 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.rest; + +import me.zhengjie.aop.log.Log; +import me.zhengjie.modules.wms.qualityCheckSheet.domain.QualityCheckSheet; +import me.zhengjie.modules.wms.qualityCheckSheet.service.QualityCheckSheetService; +import me.zhengjie.modules.wms.qualityCheckSheet.service.dto.QualityCheckSheetQueryCriteria; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.*; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +@Api(tags = "QualityCheckSheet管理") +@RestController +@RequestMapping("api") +public class QualityCheckSheetController { + + @Autowired + private QualityCheckSheetService qualityCheckSheetService; + + @Log("查询QualityCheckSheet") + @ApiOperation(value = "查询QualityCheckSheet") + @GetMapping(value = "/qualityCheckSheet") + @PreAuthorize("hasAnyRole('ADMIN','QUALITYCHECKSHEET_ALL','QUALITYCHECKSHEET_SELECT')") + public ResponseEntity getQualityCheckSheets(QualityCheckSheetQueryCriteria criteria, Pageable pageable){ + return new ResponseEntity(qualityCheckSheetService.queryAll(criteria,pageable),HttpStatus.OK); + } + + @Log("新增QualityCheckSheet") + @ApiOperation(value = "新增QualityCheckSheet") + @PostMapping(value = "/qualityCheckSheet") + @PreAuthorize("hasAnyRole('ADMIN','QUALITYCHECKSHEET_ALL','QUALITYCHECKSHEET_CREATE')") + public ResponseEntity create(@Validated @RequestBody QualityCheckSheet resources){ + return new ResponseEntity(qualityCheckSheetService.create(resources),HttpStatus.CREATED); + } + + @Log("修改QualityCheckSheet") + @ApiOperation(value = "修改QualityCheckSheet") + @PutMapping(value = "/qualityCheckSheet") + @PreAuthorize("hasAnyRole('ADMIN','QUALITYCHECKSHEET_ALL','QUALITYCHECKSHEET_EDIT')") + public ResponseEntity update(@Validated @RequestBody QualityCheckSheet resources){ + qualityCheckSheetService.update(resources); + return new ResponseEntity(HttpStatus.NO_CONTENT); + } + + @Log("删除QualityCheckSheet") + @ApiOperation(value = "删除QualityCheckSheet") + @DeleteMapping(value = "/qualityCheckSheet/{id}") + @PreAuthorize("hasAnyRole('ADMIN','QUALITYCHECKSHEET_ALL','QUALITYCHECKSHEET_DELETE')") + public ResponseEntity delete(@PathVariable Long id){ + qualityCheckSheetService.delete(id); + return new ResponseEntity(HttpStatus.OK); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/rest/QualityCheckSheetProductController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/rest/QualityCheckSheetProductController.java new file mode 100644 index 00000000..85ec83bf --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/rest/QualityCheckSheetProductController.java @@ -0,0 +1,61 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.rest; + +import me.zhengjie.aop.log.Log; +import me.zhengjie.modules.wms.qualityCheckSheet.domain.QualityCheckSheetProduct; +import me.zhengjie.modules.wms.qualityCheckSheet.service.QualityCheckSheetProductService; +import me.zhengjie.modules.wms.qualityCheckSheet.service.dto.QualityCheckSheetProductQueryCriteria; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.*; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +@Api(tags = "QualityCheckSheetProduct管理") +@RestController +@RequestMapping("api") +public class QualityCheckSheetProductController { + + @Autowired + private QualityCheckSheetProductService qualityCheckSheetProductService; + + @Log("查询QualityCheckSheetProduct") + @ApiOperation(value = "查询QualityCheckSheetProduct") + @GetMapping(value = "/qualityCheckSheetProduct") + @PreAuthorize("hasAnyRole('ADMIN','QUALITYCHECKSHEETPRODUCT_ALL','QUALITYCHECKSHEETPRODUCT_SELECT')") + public ResponseEntity getQualityCheckSheetProducts(QualityCheckSheetProductQueryCriteria criteria, Pageable pageable){ + return new ResponseEntity(qualityCheckSheetProductService.queryAll(criteria,pageable),HttpStatus.OK); + } + + @Log("新增QualityCheckSheetProduct") + @ApiOperation(value = "新增QualityCheckSheetProduct") + @PostMapping(value = "/qualityCheckSheetProduct") + @PreAuthorize("hasAnyRole('ADMIN','QUALITYCHECKSHEETPRODUCT_ALL','QUALITYCHECKSHEETPRODUCT_CREATE')") + public ResponseEntity create(@Validated @RequestBody QualityCheckSheetProduct resources){ + return new ResponseEntity(qualityCheckSheetProductService.create(resources),HttpStatus.CREATED); + } + + @Log("修改QualityCheckSheetProduct") + @ApiOperation(value = "修改QualityCheckSheetProduct") + @PutMapping(value = "/qualityCheckSheetProduct") + @PreAuthorize("hasAnyRole('ADMIN','QUALITYCHECKSHEETPRODUCT_ALL','QUALITYCHECKSHEETPRODUCT_EDIT')") + public ResponseEntity update(@Validated @RequestBody QualityCheckSheetProduct resources){ + qualityCheckSheetProductService.update(resources); + return new ResponseEntity(HttpStatus.NO_CONTENT); + } + + @Log("删除QualityCheckSheetProduct") + @ApiOperation(value = "删除QualityCheckSheetProduct") + @DeleteMapping(value = "/qualityCheckSheetProduct/{id}") + @PreAuthorize("hasAnyRole('ADMIN','QUALITYCHECKSHEETPRODUCT_ALL','QUALITYCHECKSHEETPRODUCT_DELETE')") + public ResponseEntity delete(@PathVariable Long id){ + qualityCheckSheetProductService.delete(id); + return new ResponseEntity(HttpStatus.OK); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/QualityCheckSheetProductService.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/QualityCheckSheetProductService.java new file mode 100644 index 00000000..3b0e452f --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/QualityCheckSheetProductService.java @@ -0,0 +1,64 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.service; + +import me.zhengjie.modules.wms.qualityCheckSheet.domain.QualityCheckSheetProduct; +import me.zhengjie.modules.wms.qualityCheckSheet.service.dto.QualityCheckSheetProductDTO; +import me.zhengjie.modules.wms.qualityCheckSheet.service.dto.QualityCheckSheetProductQueryCriteria; +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Pageable; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +//@CacheConfig(cacheNames = "qualityCheckSheetProduct") +public interface QualityCheckSheetProductService { + + /** + * queryAll 分页 + * @param criteria + * @param pageable + * @return + */ + //@Cacheable(keyGenerator = "keyGenerator") + Object queryAll(QualityCheckSheetProductQueryCriteria criteria, Pageable pageable); + + /** + * queryAll 不分页 + * @param criteria + * @return + */ + //@Cacheable(keyGenerator = "keyGenerator") + public Object queryAll(QualityCheckSheetProductQueryCriteria criteria); + + /** + * findById + * @param id + * @return + */ + //@Cacheable(key = "#p0") + QualityCheckSheetProductDTO findById(Long id); + + /** + * create + * @param resources + * @return + */ + //@CacheEvict(allEntries = true) + QualityCheckSheetProductDTO create(QualityCheckSheetProduct resources); + + /** + * update + * @param resources + */ + //@CacheEvict(allEntries = true) + void update(QualityCheckSheetProduct resources); + + /** + * delete + * @param id + */ + //@CacheEvict(allEntries = true) + void delete(Long id); +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/QualityCheckSheetService.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/QualityCheckSheetService.java new file mode 100644 index 00000000..376f2348 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/QualityCheckSheetService.java @@ -0,0 +1,64 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.service; + +import me.zhengjie.modules.wms.qualityCheckSheet.domain.QualityCheckSheet; +import me.zhengjie.modules.wms.qualityCheckSheet.service.dto.QualityCheckSheetDTO; +import me.zhengjie.modules.wms.qualityCheckSheet.service.dto.QualityCheckSheetQueryCriteria; +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Pageable; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +//@CacheConfig(cacheNames = "qualityCheckSheet") +public interface QualityCheckSheetService { + + /** + * queryAll 分页 + * @param criteria + * @param pageable + * @return + */ + //@Cacheable(keyGenerator = "keyGenerator") + Object queryAll(QualityCheckSheetQueryCriteria criteria, Pageable pageable); + + /** + * queryAll 不分页 + * @param criteria + * @return + */ + //@Cacheable(keyGenerator = "keyGenerator") + public Object queryAll(QualityCheckSheetQueryCriteria criteria); + + /** + * findById + * @param id + * @return + */ + //@Cacheable(key = "#p0") + QualityCheckSheetDTO findById(Long id); + + /** + * create + * @param resources + * @return + */ + //@CacheEvict(allEntries = true) + QualityCheckSheetDTO create(QualityCheckSheet resources); + + /** + * update + * @param resources + */ + //@CacheEvict(allEntries = true) + void update(QualityCheckSheet resources); + + /** + * delete + * @param id + */ + //@CacheEvict(allEntries = true) + void delete(Long id); +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetDTO.java new file mode 100644 index 00000000..d54b7efd --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetDTO.java @@ -0,0 +1,34 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.service.dto; + +import lombok.Data; +import java.sql.Timestamp; +import java.io.Serializable; + + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +@Data +public class QualityCheckSheetDTO implements Serializable { + + // 主键 + private Long id; + + private Timestamp createTime; + + private Timestamp updateTime; + + private Integer status; + + // 制单人 + private Long makePeopleId; + + // 制单人姓名 + private String makePeopleName; + + // 质量检验单单据编号 + private String qualityCheekSheetCode; + + private String remark; +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetProductDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetProductDTO.java new file mode 100644 index 00000000..a081007e --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetProductDTO.java @@ -0,0 +1,43 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.service.dto; + +import lombok.Data; +import java.sql.Timestamp; +import java.io.Serializable; + + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +@Data +public class QualityCheckSheetProductDTO implements Serializable { + + // 主键 + private Long id; + + private Timestamp createTime; + + private Timestamp updateTime; + + private Integer status; + + // 所属质量检验单 + private Long qualityCheckSheetId; + + private String productCode; + + private Long productId; + + private String productName; + + private String remark; + + // 产品个数 + private Integer productNumber; + + // 合格个数 + private Integer qualifiedNumber; + + // 报废数量 + private Integer scrapNumber; +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetProductQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetProductQueryCriteria.java new file mode 100644 index 00000000..9d87b132 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetProductQueryCriteria.java @@ -0,0 +1,13 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.service.dto; + +import lombok.Data; +import java.sql.Timestamp; +import me.zhengjie.annotation.Query; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +@Data +public class QualityCheckSheetProductQueryCriteria{ +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetQueryCriteria.java new file mode 100644 index 00000000..345277ee --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetQueryCriteria.java @@ -0,0 +1,13 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.service.dto; + +import lombok.Data; +import java.sql.Timestamp; +import me.zhengjie.annotation.Query; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +@Data +public class QualityCheckSheetQueryCriteria{ +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetProductServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetProductServiceImpl.java new file mode 100644 index 00000000..4c2698c0 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetProductServiceImpl.java @@ -0,0 +1,73 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.service.impl; + +import me.zhengjie.modules.wms.qualityCheckSheet.domain.QualityCheckSheetProduct; +import me.zhengjie.utils.ValidationUtil; +import me.zhengjie.modules.wms.qualityCheckSheet.repository.QualityCheckSheetProductRepository; +import me.zhengjie.modules.wms.qualityCheckSheet.service.QualityCheckSheetProductService; +import me.zhengjie.modules.wms.qualityCheckSheet.service.dto.QualityCheckSheetProductDTO; +import me.zhengjie.modules.wms.qualityCheckSheet.service.dto.QualityCheckSheetProductQueryCriteria; +import me.zhengjie.modules.wms.qualityCheckSheet.service.mapper.QualityCheckSheetProductMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import java.util.Optional; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import me.zhengjie.utils.PageUtil; +import me.zhengjie.utils.QueryHelp; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +@Service +@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) +public class QualityCheckSheetProductServiceImpl implements QualityCheckSheetProductService { + + @Autowired + private QualityCheckSheetProductRepository qualityCheckSheetProductRepository; + + @Autowired + private QualityCheckSheetProductMapper qualityCheckSheetProductMapper; + + @Override + public Object queryAll(QualityCheckSheetProductQueryCriteria criteria, Pageable pageable){ + Page page = qualityCheckSheetProductRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); + return PageUtil.toPage(page.map(qualityCheckSheetProductMapper::toDto)); + } + + @Override + public Object queryAll(QualityCheckSheetProductQueryCriteria criteria){ + return qualityCheckSheetProductMapper.toDto(qualityCheckSheetProductRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + } + + @Override + public QualityCheckSheetProductDTO findById(Long id) { + Optional qualityCheckSheetProduct = qualityCheckSheetProductRepository.findById(id); + ValidationUtil.isNull(qualityCheckSheetProduct,"QualityCheckSheetProduct","id",id); + return qualityCheckSheetProductMapper.toDto(qualityCheckSheetProduct.get()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public QualityCheckSheetProductDTO create(QualityCheckSheetProduct resources) { + return qualityCheckSheetProductMapper.toDto(qualityCheckSheetProductRepository.save(resources)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(QualityCheckSheetProduct resources) { + Optional optionalQualityCheckSheetProduct = qualityCheckSheetProductRepository.findById(resources.getId()); + ValidationUtil.isNull( optionalQualityCheckSheetProduct,"QualityCheckSheetProduct","id",resources.getId()); + QualityCheckSheetProduct qualityCheckSheetProduct = optionalQualityCheckSheetProduct.get(); + qualityCheckSheetProduct.copy(resources); + qualityCheckSheetProductRepository.save(qualityCheckSheetProduct); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(Long id) { + qualityCheckSheetProductRepository.deleteById(id); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetServiceImpl.java new file mode 100644 index 00000000..093494ea --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetServiceImpl.java @@ -0,0 +1,73 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.service.impl; + +import me.zhengjie.modules.wms.qualityCheckSheet.domain.QualityCheckSheet; +import me.zhengjie.utils.ValidationUtil; +import me.zhengjie.modules.wms.qualityCheckSheet.repository.QualityCheckSheetRepository; +import me.zhengjie.modules.wms.qualityCheckSheet.service.QualityCheckSheetService; +import me.zhengjie.modules.wms.qualityCheckSheet.service.dto.QualityCheckSheetDTO; +import me.zhengjie.modules.wms.qualityCheckSheet.service.dto.QualityCheckSheetQueryCriteria; +import me.zhengjie.modules.wms.qualityCheckSheet.service.mapper.QualityCheckSheetMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import java.util.Optional; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import me.zhengjie.utils.PageUtil; +import me.zhengjie.utils.QueryHelp; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +@Service +@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) +public class QualityCheckSheetServiceImpl implements QualityCheckSheetService { + + @Autowired + private QualityCheckSheetRepository qualityCheckSheetRepository; + + @Autowired + private QualityCheckSheetMapper qualityCheckSheetMapper; + + @Override + public Object queryAll(QualityCheckSheetQueryCriteria criteria, Pageable pageable){ + Page page = qualityCheckSheetRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); + return PageUtil.toPage(page.map(qualityCheckSheetMapper::toDto)); + } + + @Override + public Object queryAll(QualityCheckSheetQueryCriteria criteria){ + return qualityCheckSheetMapper.toDto(qualityCheckSheetRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + } + + @Override + public QualityCheckSheetDTO findById(Long id) { + Optional qualityCheckSheet = qualityCheckSheetRepository.findById(id); + ValidationUtil.isNull(qualityCheckSheet,"QualityCheckSheet","id",id); + return qualityCheckSheetMapper.toDto(qualityCheckSheet.get()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public QualityCheckSheetDTO create(QualityCheckSheet resources) { + return qualityCheckSheetMapper.toDto(qualityCheckSheetRepository.save(resources)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(QualityCheckSheet resources) { + Optional optionalQualityCheckSheet = qualityCheckSheetRepository.findById(resources.getId()); + ValidationUtil.isNull( optionalQualityCheckSheet,"QualityCheckSheet","id",resources.getId()); + QualityCheckSheet qualityCheckSheet = optionalQualityCheckSheet.get(); + qualityCheckSheet.copy(resources); + qualityCheckSheetRepository.save(qualityCheckSheet); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(Long id) { + qualityCheckSheetRepository.deleteById(id); + } +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/mapper/QualityCheckSheetMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/mapper/QualityCheckSheetMapper.java new file mode 100644 index 00000000..641f2842 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/mapper/QualityCheckSheetMapper.java @@ -0,0 +1,16 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.service.mapper; + +import me.zhengjie.mapper.EntityMapper; +import me.zhengjie.modules.wms.qualityCheckSheet.domain.QualityCheckSheet; +import me.zhengjie.modules.wms.qualityCheckSheet.service.dto.QualityCheckSheetDTO; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface QualityCheckSheetMapper extends EntityMapper { + +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/mapper/QualityCheckSheetProductMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/mapper/QualityCheckSheetProductMapper.java new file mode 100644 index 00000000..0632b1f8 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/mapper/QualityCheckSheetProductMapper.java @@ -0,0 +1,16 @@ +package me.zhengjie.modules.wms.qualityCheckSheet.service.mapper; + +import me.zhengjie.mapper.EntityMapper; +import me.zhengjie.modules.wms.qualityCheckSheet.domain.QualityCheckSheetProduct; +import me.zhengjie.modules.wms.qualityCheckSheet.service.dto.QualityCheckSheetProductDTO; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +/** +* @author huangxingxing +* @date 2019-11-12 +*/ +@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface QualityCheckSheetProductMapper extends EntityMapper { + +} \ No newline at end of file