From 54ddc488de0f67be3ddf7607d958aaaf42f108bb Mon Sep 17 00:00:00 2001 From: Tom Li Date: Thu, 8 Jan 2026 13:22:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=86=B2=E7=AA=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/quality/constant/CheckType.java | 14 +++++ .../desk/quality/constant/NgConst.java | 9 ++++ .../desk/quality/controller/NgController.java | 53 +++++++++++++++++-- .../desk/quality/mapper/NgMapper.xml | 12 +++-- .../desk/quality/pojo/entity/Ng.java | 6 +-- .../desk/quality/service/NgService.java | 14 ----- 6 files changed, 84 insertions(+), 24 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/NgConst.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java new file mode 100644 index 00000000..00e3dc0e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java @@ -0,0 +1,14 @@ +package org.springblade.desk.quality.constant; + +public interface CheckType { + + /** + * 热表 + */ + Integer RB = 1; + + /** + * 烧结 + */ + Integer SJ = 2; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/NgConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/NgConst.java new file mode 100644 index 00000000..46022d19 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/NgConst.java @@ -0,0 +1,9 @@ +package org.springblade.desk.quality.constant; + +public interface NgConst { + + Integer TYPE_1 = 1; + Integer TYPE_2 = 2; + Integer TYPE_3 = 3; + Integer TYPE_4 = 4; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java index 03c653b0..0676f181 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -30,6 +30,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; import org.springblade.desk.order.pojo.entity.YieldOrderCraft; +import org.springblade.desk.quality.constant.NgConst; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.NgExcel; import org.springblade.desk.quality.pojo.entity.Ng; @@ -42,6 +43,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -120,9 +122,54 @@ public class NgController extends BladeController { @Parameter(description = "parentId", required = false) @RequestParam Integer parentId) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(Ng.class); qw.eq(Ng::getNgType, ngType); - if (parentId != null) { - qw.eq(Ng::getParentId, parentId); - } + qw.eq(Objects.nonNull(parentId), Ng::getParentId, parentId); + qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE); + List list = service.list(qw); + List listVO = NgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [缺陷] [故障类别]list下拉选择 + */ + @GetMapping("/listForSelectGZLB") + @ApiOperationSupport(order = 22) + @Operation(summary = "[故障类别]list下拉选择", description = "") + public R> listForSelect() { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(Ng.class); + qw.eq(Ng::getNgType, NgConst.TYPE_2); + qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE); + List list = service.list(qw); + List listVO = NgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [缺陷] [问题大类]list下拉选择 + */ + @GetMapping("/listForSelectWTDL") + @ApiOperationSupport(order = 22) + @Operation(summary = "[问题大类]list下拉选择", description = "") + public R> listForSelectWTDL() { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(Ng.class); + qw.eq(Ng::getNgType, NgConst.TYPE_3); + qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE); + List list = service.list(qw); + List listVO = NgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [缺陷] [问题小类]list下拉选择 + */ + @GetMapping("/listForSelectWTXL") + @ApiOperationSupport(order = 22) + @Operation(summary = "[问题小类]list下拉选择", description = "") + public R> listForSelectWTXL( + @Parameter(description = "parentId", required = true) @RequestParam Integer parentId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(Ng.class); + qw.eq(Ng::getNgType, NgConst.TYPE_4); + qw.eq(Ng::getParentId, parentId); qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE); List list = service.list(qw); List listVO = NgWrapper.build().listVO(list); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml index ac77b49d..95cd1ba9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml @@ -1,5 +1,6 @@ - + @@ -10,7 +11,7 @@ - + @@ -18,10 +19,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java index ad148988..262ec0dd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; /** * [缺陷] 实体类 - * + * mes v1: bs_review_sheet_type BsReviewSheetType 不良原因 * @author Tom Shuo * @since 2026-01-04 */ @@ -54,7 +54,7 @@ public class Ng extends BaseEntity { /** * 缺陷描述 */ - public static final String COL_DESC = "DESC"; + public static final String COL_DESCRIPTION = "DESCRIPTION"; /** * [制品]id */ @@ -106,7 +106,7 @@ public class Ng extends BaseEntity { * 缺陷描述 */ @Schema(description = "缺陷描述") - private String desc; + private String description; /** * [制品]id */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java deleted file mode 100644 index 9cc70d1a..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.springblade.desk.quality.service; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@Slf4j -@Data -public class NgService { - -}