From a32eac2321a3270c85ce19e62d1ab320fc49ef88 Mon Sep 17 00:00:00 2001 From: starrysky <838252223@qq.com> Date: Sun, 6 Oct 2019 17:09:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEoutSourceProcessSheetCode?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhengjie/modules/security/security/JwtUser.java | 3 ++- .../domain/OutSourceInspectionCertificate.java | 4 ++-- .../CreateOutSourceInspectionCertificateRequest.java | 2 +- .../OutSourceInspectionCertificateProductRequest.java | 2 ++ .../dto/OutSourceInspectionCertificateDTO.java | 4 ++-- .../OutSourceInspectionCertificateQueryCriteria.java | 5 +++-- .../OutSourceInspectionCertificateServiceImpl.java | 11 +++++++++-- 7 files changed, 21 insertions(+), 10 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtUser.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtUser.java index bc39e9a1..5e55c4f3 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtUser.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtUser.java @@ -18,7 +18,8 @@ import java.util.stream.Collectors; @AllArgsConstructor public class JwtUser implements UserDetails { - @JsonIgnore +// @JsonIgnore + // TODO userId private final Long id; private final String username; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/domain/OutSourceInspectionCertificate.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/domain/OutSourceInspectionCertificate.java index df2fcbd5..e132ce70 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/domain/OutSourceInspectionCertificate.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/domain/OutSourceInspectionCertificate.java @@ -37,8 +37,8 @@ public class OutSourceInspectionCertificate implements Serializable { private Boolean status; // 所属委外加工单 - @Column(name = "out_source_process_sheet_id") - private Long outSourceProcessSheetId; + @Column(name = "out_source_process_sheet_code") + private String outSourceProcessSheetCode; // 制单人 @Column(name = "make_people_id") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/request/CreateOutSourceInspectionCertificateRequest.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/request/CreateOutSourceInspectionCertificateRequest.java index 97e8a7ef..d138106f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/request/CreateOutSourceInspectionCertificateRequest.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/request/CreateOutSourceInspectionCertificateRequest.java @@ -18,7 +18,7 @@ public class CreateOutSourceInspectionCertificateRequest implements Serializable // 所属委外加工单 - private Long outSourceProcessSheetId; + private String outSourceProcessSheetCode; // 制单人 private Long makePeopleId; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/request/OutSourceInspectionCertificateProductRequest.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/request/OutSourceInspectionCertificateProductRequest.java index 1c002822..3afd82d9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/request/OutSourceInspectionCertificateProductRequest.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/request/OutSourceInspectionCertificateProductRequest.java @@ -24,6 +24,8 @@ public class OutSourceInspectionCertificateProductRequest implements Serializabl private String productName; + private Integer productNumber; + private String remark; // 合格数量 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceInspectionCertificateDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceInspectionCertificateDTO.java index fdd802b7..2899ff08 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceInspectionCertificateDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceInspectionCertificateDTO.java @@ -25,7 +25,7 @@ public class OutSourceInspectionCertificateDTO implements Serializable { private Boolean status; // 所属委外加工单 - private Long outSourceProcessSheetId; + private String outSourceProcessSheetCode; // 制单人 private Long makePeopleId; @@ -39,5 +39,5 @@ public class OutSourceInspectionCertificateDTO implements Serializable { private String remark; // 委外验收单产品信息 - private List outSourceInspectionCertificateDTOList; + private List outSourceInspectionCertificateProductList; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceInspectionCertificateQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceInspectionCertificateQueryCriteria.java index c16d4932..2b8064ab 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceInspectionCertificateQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceInspectionCertificateQueryCriteria.java @@ -1,8 +1,6 @@ package me.zhengjie.modules.wms.outSourceProductSheet.service.dto; import lombok.Data; -import java.sql.Timestamp; -import me.zhengjie.annotation.Query; /** * @author jie @@ -10,4 +8,7 @@ import me.zhengjie.annotation.Query; */ @Data public class OutSourceInspectionCertificateQueryCriteria { + + // 所属委外加工单 + private String outSourceProcessSheetCode; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceInspectionCertificateServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceInspectionCertificateServiceImpl.java index 4dda091e..5f4b8d8f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceInspectionCertificateServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceInspectionCertificateServiceImpl.java @@ -71,6 +71,13 @@ public class OutSourceInspectionCertificateServiceImpl implements OutSourceInspe Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); targetPredicateList.add(statusPredicate); + + String outSourceProcessSheetCode = criteria.getOutSourceProcessSheetCode(); + if(!StringUtils.isEmpty(outSourceProcessSheetCode)){ + Predicate outSourceProcessSheetCodePredicate = criteriaBuilder.like(root.get("outSourceProcessSheetCode"), "%"+ outSourceProcessSheetCode + "%"); + targetPredicateList.add(outSourceProcessSheetCodePredicate); + } + if(CollectionUtils.isEmpty(targetPredicateList)){ return null; }else{ @@ -113,7 +120,7 @@ public class OutSourceInspectionCertificateServiceImpl implements OutSourceInspe List outSourceInspectionCertificateProductList = outSourceInspectionCertificateProductRepository.queryByOutSourceInspectionCertificateIdAndStatusTrue(id); if(!CollectionUtils.isEmpty(outSourceInspectionCertificateProductList)){ List outSourceInspectionCertificateProductDTOList = outSourceInspectionCertificateProductMapper.toDto(outSourceInspectionCertificateProductList); - outSourceInspectionCertificateDTO.setOutSourceInspectionCertificateDTOList(outSourceInspectionCertificateProductDTOList); + outSourceInspectionCertificateDTO.setOutSourceInspectionCertificateProductList(outSourceInspectionCertificateProductDTOList); } return outSourceInspectionCertificateDTO; } @@ -160,7 +167,7 @@ public class OutSourceInspectionCertificateServiceImpl implements OutSourceInspe BeanUtils.copyProperties(outSourceInspectionCertificateProduct, outSourceInspectionCertificateProductDTO); outSourceInspectionCertificateProductDTOList.add(outSourceInspectionCertificateProductDTO); } - outSourceInspectionCertificateDTO.setOutSourceInspectionCertificateDTOList(outSourceInspectionCertificateProductDTOList); + outSourceInspectionCertificateDTO.setOutSourceInspectionCertificateProductList(outSourceInspectionCertificateProductDTOList); } return outSourceInspectionCertificateDTO;