飞靶和挂具：删除字段fsName和rsName，fsType和rsType就是名称

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/FeiBaSetEntity.java

@@ -31,16 +31,11 @@ public class FeiBaSetEntity extends BaseEntity {
     /**
      * 类型
      */
-    @Schema(description = "类型")
+    @Schema(description = "名称")
     private String fsType;
     /**
      *
      */
     @Schema(description = "")
-    private Short bindQty;
+    private Short bindQty = 0;
-    /**
-     * 名称
-     */
-    @Schema(description = "名称")
-    private String fsName;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RackSetEntity.java

@@ -31,17 +31,12 @@ public class RackSetEntity extends BaseEntity {
     /**
      * 类型
      */
-    @Schema(description = "类型")
+    @Schema(description = "名称")
     private String rsType;
     /**
      *
      */
     @Schema(description = "")
     private Short bindQty;
-    /**
-     * 名称
-     */
-    @Schema(description = "名称")
-    private String rsName;
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/FeiBaSetExcel.java

@@ -66,11 +66,5 @@ public class FeiBaSetExcel implements Serializable {
     @ColumnWidth(20)
     @ExcelProperty("")
     private Short bindQty;
-    /**
-     * 名称
-     */
-    @ColumnWidth(20)
-    @ExcelProperty("名称")
-    private String fsName;
 
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RackSetExcel.java

@@ -66,11 +66,5 @@ public class RackSetExcel implements Serializable {
     @ColumnWidth(20)
     @ExcelProperty("")
     private Short bindQty;
-    /**
-     * 名称
-     */
-    @ColumnWidth(20)
-    @ExcelProperty("名称")
-    private String rsName;
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java

@@ -68,7 +68,7 @@ public class FeiBaSetController extends BladeController {
     @Operation(summary = "分页", description = "")
     @Parameters({
             @Parameter(name = "fsCode", description = "飞靶编码", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
-            @Parameter(name = "fsName", description = "飞靶名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
+            @Parameter(name = "fsType", description = "飞靶名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
             @Parameter(name = "status", description = "飞靶状态", in = ParameterIn.QUERY, schema = @Schema(type = "int")),
     })
     public R<IPage<FeiBaSetVO>> page(@Parameter(hidden = true) FeiBaSetEntity feiBaSet, Query query) {

blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java

@@ -93,7 +93,7 @@ public class RackSetController extends BladeController {
     @Operation(summary = "分页", description = "")
     @Parameters({
             @Parameter(name = "rsCode", description = "挂具编码", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
-            @Parameter(name = "rsName", description = "挂具名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
+            @Parameter(name = "rsType", description = "挂具名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
             @Parameter(name = "status", description = "挂具状态", in = ParameterIn.QUERY, schema = @Schema(type = "int")),
     })
     public R<IPage<RackSetVO>> page(@Parameter(hidden = true) RackSetEntity rackSet, Query query) {

blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/FeiBaSetMapper.xml

@@ -15,7 +15,6 @@
         <result column="FS_CODE" property="fsCode"/>
         <result column="FS_TYPE" property="fsType"/>
         <result column="BIND_QTY" property="bindQty"/>
-        <result column="FS_NAME" property="fsName"/>
     </resultMap>
 
 

blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RackSetMapper.xml

@@ -15,7 +15,6 @@
         <result column="RS_CODE" property="rsCode"/>
         <result column="RS_TYPE" property="rsType"/>
         <result column="BIND_QTY" property="bindQty"/>
-        <result column="RS_NAME" property="rsName"/>
     </resultMap>
 
 

blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java

@@ -35,7 +35,7 @@ public class FeiBaSetServiceImpl extends BaseServiceImpl<FeiBaSetMapper, FeiBaSe
         // 2. 动态添加条件（核心！）
         // 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件
         wrapper.like(Objects.nonNull(feiBaSet.getFsCode()), FeiBaSetEntity::getFsCode, feiBaSet.getFsCode())
-                .like(Objects.nonNull(feiBaSet.getFsName()), FeiBaSetEntity::getFsName, feiBaSet.getFsName())
+                .like(Objects.nonNull(feiBaSet.getFsType()), FeiBaSetEntity::getFsType, feiBaSet.getFsType())
                 .eq(Objects.nonNull(feiBaSet.getStatus()), FeiBaSetEntity::getStatus, feiBaSet.getStatus());
 
         // 3. 执行分页查询

blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RackSetServiceImpl.java

@@ -59,7 +59,7 @@ public class RackSetServiceImpl extends BaseServiceImpl<RackSetMapper, RackSetEn
         // 2. 动态添加条件（核心！）
         // 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件
         wrapper.like(Objects.nonNull(rackSet.getRsCode()), RackSetEntity::getRsCode, rackSet.getRsCode())
-                .like(Objects.nonNull(rackSet.getRsName()), RackSetEntity::getRsName, rackSet.getRsName())
+                .like(Objects.nonNull(rackSet.getRsType()), RackSetEntity::getRsType, rackSet.getRsType())
                 .eq(Objects.nonNull(rackSet.getStatus()), RackSetEntity::getStatus, rackSet.getStatus());
 
         // 3. 执行分页查询

doc/sql/mes/increase-251229.sql

@@ -1,9 +0,0 @@
-ALTER TABLE MES_FEI_BA_SET
-    ADD (FS_NAME NVARCHAR2(255) NOT NULL);
-COMMENT
-ON COLUMN MES_FEI_BA_SET.FS_NAME IS '名称';
-
-ALTER TABLE MES_RACK_SET
-    ADD (RS_NAME NVARCHAR2(255) NOT NULL);
-COMMENT
-ON COLUMN MES_RACK_SET.RS_NAME IS '名称';