From 584ed7819615eba18562f7c8bcde7412bde40806 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Mon, 5 Jan 2026 13:50:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E9=9D=B6=E5=92=8C=E6=8C=82=E5=85=B7?= =?UTF-8?q?=EF=BC=9A=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5fsName=E5=92=8CrsN?= =?UTF-8?q?ame=EF=BC=8CfsType=E5=92=8CrsType=E5=B0=B1=E6=98=AF=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/device/pojo/entity/FeiBaSetEntity.java | 9 ++------- .../desk/device/pojo/entity/RackSetEntity.java | 7 +------ .../desk/device/pojo/excel/FeiBaSetExcel.java | 6 ------ .../springblade/desk/device/pojo/excel/RackSetExcel.java | 6 ------ .../desk/device/controller/FeiBaSetController.java | 2 +- .../desk/device/controller/RackSetController.java | 2 +- .../springblade/desk/device/mapper/FeiBaSetMapper.xml | 1 - .../org/springblade/desk/device/mapper/RackSetMapper.xml | 1 - .../desk/device/service/impl/FeiBaSetServiceImpl.java | 2 +- .../desk/device/service/impl/RackSetServiceImpl.java | 2 +- doc/sql/mes/increase-251229.sql | 9 --------- 11 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 doc/sql/mes/increase-251229.sql diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/FeiBaSetEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/FeiBaSetEntity.java index e2e968a5..04cebec2 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/FeiBaSetEntity.java +++ b/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; - /** - * 名称 - */ - @Schema(description = "名称") - private String fsName; + private Short bindQty = 0; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RackSetEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RackSetEntity.java index 9d4ffb2b..1cd5ded4 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RackSetEntity.java +++ b/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; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/FeiBaSetExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/FeiBaSetExcel.java index 3297155d..21c8851f 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/FeiBaSetExcel.java +++ b/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; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RackSetExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RackSetExcel.java index a7109f57..79a5f3bf 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RackSetExcel.java +++ b/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; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java index ec4ff859..828adfee 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java +++ b/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> page(@Parameter(hidden = true) FeiBaSetEntity feiBaSet, Query query) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java index 7e00d93e..dcbc949e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RackSetController.java +++ b/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> page(@Parameter(hidden = true) RackSetEntity rackSet, Query query) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/FeiBaSetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/FeiBaSetMapper.xml index d5fab31b..50ea72c1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/FeiBaSetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/FeiBaSetMapper.xml @@ -15,7 +15,6 @@ - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RackSetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RackSetMapper.xml index 55902b8e..c58c50df 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RackSetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RackSetMapper.xml @@ -15,7 +15,6 @@ - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java index 8f497f29..281ae9a2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java @@ -35,7 +35,7 @@ public class FeiBaSetServiceImpl extends BaseServiceImpl