字段冲突。

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;
+}

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;
+}

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<Ng> 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<Ng> list = service.list(qw);
+        List<NgVO> listVO = NgWrapper.build().listVO(list);
+        return R.data(listVO);
+    }
+
+    /**
+     * [缺陷] [故障类别]list下拉选择
+     */
+    @GetMapping("/listForSelectGZLB")
+    @ApiOperationSupport(order = 22)
+    @Operation(summary = "[故障类别]list下拉选择", description = "")
+    public R<List<NgVO>> listForSelect() {
+        LambdaQueryWrapper<Ng> qw = Wrappers.lambdaQuery(Ng.class);
+        qw.eq(Ng::getNgType, NgConst.TYPE_2);
+        qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE);
+        List<Ng> list = service.list(qw);
+        List<NgVO> listVO = NgWrapper.build().listVO(list);
+        return R.data(listVO);
+    }
+
+    /**
+     * [缺陷] [问题大类]list下拉选择
+     */
+    @GetMapping("/listForSelectWTDL")
+    @ApiOperationSupport(order = 22)
+    @Operation(summary = "[问题大类]list下拉选择", description = "")
+    public R<List<NgVO>> listForSelectWTDL() {
+        LambdaQueryWrapper<Ng> qw = Wrappers.lambdaQuery(Ng.class);
+        qw.eq(Ng::getNgType, NgConst.TYPE_3);
+        qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE);
+        List<Ng> list = service.list(qw);
+        List<NgVO> listVO = NgWrapper.build().listVO(list);
+        return R.data(listVO);
+    }
+
+    /**
+     * [缺陷] [问题小类]list下拉选择
+     */
+    @GetMapping("/listForSelectWTXL")
+    @ApiOperationSupport(order = 22)
+    @Operation(summary = "[问题小类]list下拉选择", description = "")
+    public R<List<NgVO>> listForSelectWTXL(
+            @Parameter(description = "parentId", required = true) @RequestParam Integer parentId) {
+        LambdaQueryWrapper<Ng> 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<Ng> list = service.list(qw);
         List<NgVO> listVO = NgWrapper.build().listVO(list);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.desk.quality.mapper.NgMapper">
 
     <!-- 通用查询映射结果 -->
@@ -10,7 +11,7 @@
         <result column="PARENT_ID" property="parentId"/>
         <result column="SORT" property="sort"/>
         <result column="REMARK" property="remark"/>
-        <result column="DESC" property="desc"/>
+        <result column="DESCRIPTION" property="description"/>
         <result column="PRODUCT_ID" property="productId"/>
         <result column="PRODUCT_CODE" property="productCode"/>
         <result column="PROCESS_ID" property="processId"/>
@@ -18,10 +19,13 @@
     </resultMap>
 
     <select id="selectNgPage" resultMap="ngResultMap">
-        SELECT * FROM QA_NG WHERE is_deleted = 0
+        SELECT *
+        FROM QA_NG
+        WHERE is_deleted = 0
     </select>
 
     <select id="exportNg" resultType="org.springblade.desk.quality.excel.NgExcel">
-        SELECT * FROM QA_NG ${ew.customSqlSegment}
+        SELECT *
+        FROM QA_NG ${ew.customSqlSegment}
     </select>
 </mapper>

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
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java

@@ -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 {
-
-}