♻️ refactor(machinery): 统一规格型号字段命名为 'specification'

YunaiV
1 parent a5e130d1
Showing 27 changed files with 28 additions and 28 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkplan/MesDvCheckPlanMachineryController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkplan/vo/machinery/MesDvCheckPlanMachineryRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/vo/MesDvCheckRecordRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachinerySaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/vo/MesDvMaintenRecordRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/vo/MesDvRepairRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskIssueController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskIssueRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderItemRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
@@ -75,7 +75,7 @@ public class MesDvCheckPlanMachineryController {
         return BeanUtils.toBean(list, MesDvCheckPlanMachineryRespVO.class, vo ->
             MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery ->
                 vo.setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName())
-                  .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec())
+                  .setMachineryBrand(machinery.getBrand()).setMachinerySpecification(machinery.getSpecification())
             )
         );
     }
@@ -28,7 +28,7 @@ public class MesDvCheckPlanMachineryRespVO {
     private String machineryBrand;
     @Schema(description = "规格型号", example = "HTF120")
-    private String machinerySpec;
+    private String machinerySpecification;
     @Schema(description = "备注")
     private String remark;
@@ -141,7 +141,7 @@ public class MesDvCheckRecordController {
                             .setPlanCycleType(plan.getCycleType()).setPlanCycleCount(plan.getCycleCount()));
             MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery -> vo
                     .setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName())
-                    .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec()));
+                    .setMachineryBrand(machinery.getBrand()).setMachinerySpecification(machinery.getSpecification()));
             MapUtils.findAndThen(userMap, vo.getUserId(),
                     user -> vo.setNickname(user.getNickname()));
         });
@@ -64,7 +64,7 @@ public class MesDvCheckRecordRespVO {
     @Schema(description = "规格型号", example = "X-100")
     @ExcelProperty("规格型号")
-    private String machinerySpec;
+    private String machinerySpecification;
     @Schema(description = "点检时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("点检时间")
@@ -124,7 +124,7 @@ public class MesDvMachineryController {
         // 手动创建导出 demo
         List<MesDvMachineryImportExcelVO> list = Collections.singletonList(
                 MesDvMachineryImportExcelVO.builder().code("EQ-001").name("示例设备")
-                        .brand("示例品牌").spec("型号A").machineryTypeCode("MT-001")
+                        .brand("示例品牌").specification("型号A").machineryTypeCode("MT-001")
                         .workshopCode("WS-001").status(0).build()
         );
         // 输出
@@ -28,7 +28,7 @@ public class MesDvMachineryImportExcelVO {
     private String brand;
     @ExcelProperty("规格型号")
-    private String spec;
+    private String specification;
     @ExcelProperty("设备类型编码")
     private String machineryTypeCode;
@@ -33,7 +33,7 @@ public class MesDvMachineryRespVO {
     @Schema(description = "规格型号", example = "S7-300")
     @ExcelProperty("规格型号")
-    private String spec;
+    private String specification;
     @Schema(description = "设备类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     private Long machineryTypeId;
@@ -26,7 +26,7 @@ public class MesDvMachinerySaveReqVO {
     private String brand;
     @Schema(description = "规格型号", example = "S7-300")
-    private String spec;
+    private String specification;
     @Schema(description = "设备类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     @NotNull(message = "设备类型不能为空")
@@ -144,7 +144,7 @@ public class MesDvMaintenRecordController {
                             .setPlanCycleCount(plan.getCycleCount()));
             MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery -> vo
                     .setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName())
-                    .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec()));
+                    .setMachineryBrand(machinery.getBrand()).setMachinerySpecification(machinery.getSpecification()));
             MapUtils.findAndThen(userMap, vo.getUserId(),
                     user -> vo.setNickname(user.getNickname()));
         });
@@ -64,7 +64,7 @@ public class MesDvMaintenRecordRespVO {
     @Schema(description = "规格型号", example = "X-100")
     @ExcelProperty("规格型号")
-    private String machinerySpec;
+    private String machinerySpecification;
     @Schema(description = "保养时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("保养时间")
@@ -159,7 +159,7 @@ public class MesDvRepairController {
         return BeanUtils.toBean(list, MesDvRepairRespVO.class, vo -> {
             MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery -> vo
                     .setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName())
-                    .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec()));
+                    .setMachineryBrand(machinery.getBrand()).setMachinerySpecification(machinery.getSpecification()));
             MapUtils.findAndThen(userMap, vo.getAcceptedUserId(),
                     user -> vo.setAcceptedUserNickname(user.getNickname()));
             MapUtils.findAndThen(userMap, vo.getConfirmUserId(),
@@ -44,7 +44,7 @@ public class MesDvRepairRespVO {
     @Schema(description = "规格型号", example = "X-100")
     @ExcelProperty("规格型号")
-    private String machinerySpec;
+    private String machinerySpecification;
     @Schema(description = "报修日期")
     @ExcelProperty("报修日期")
@@ -240,7 +240,7 @@ public class MesProTaskController {
             findAndThen(processMap, task.getProcessId(), p ->
                     vo.setProcessName(p.getName()));
             findAndThen(itemMap, task.getItemId(), item ->
-                    vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpec(item.getSpecification()));
+                    vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification()));
             findAndThen(clientMap, task.getClientId(), c ->
                     vo.setClientName(c.getName()));
             findAndThen(routeProcessCheckFlagMap, task.getRouteId(), processCheckMap ->
@@ -113,7 +113,7 @@ public class MesProTaskIssueController {
         return cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList(list, issue -> {
             MesProTaskIssueRespVO vo = BeanUtils.toBean(issue, MesProTaskIssueRespVO.class);
             findAndThen(itemMap, issue.getItemId(), item ->
-                    vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpec(item.getSpecification()));
+                    vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification()));
             findAndThen(unitMap, issue.getUnitMeasureId(), unit ->
                     vo.setUnitMeasureName(unit.getName()));
             return vo;
@@ -47,7 +47,7 @@ public class MesProTaskIssueRespVO {
     private String itemName;
     @Schema(description = "规格型号", example = "100x200mm")
-    private String itemSpec;
+    private String itemSpecification;
     @Schema(description = "单位编号", example = "1")
     private Long unitMeasureId;
@@ -56,7 +56,7 @@ public class MesProTaskRespVO {
     private String itemName;
     @Schema(description = "规格型号", example = "100x200mm")
-    private String itemSpec;
+    private String itemSpecification;
     @Schema(description = "排产数量", example = "100.00")
     private BigDecimal quantity;
@@ -128,7 +128,7 @@ public class MesProWorkOrderBomController {
             }
             MesProWorkOrderItemRespVO vo = new MesProWorkOrderItemRespVO()
                     .setItemId(item.getId()).setQuantity(entry.getValue())
-                    .setItemCode(item.getCode()).setItemName(item.getName()).setItemSpec(item.getSpecification());
+                    .setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification());
             MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
                     unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
             MapUtils.findAndThen(itemTypeMap, item.getItemTypeId(),
@@ -155,7 +155,7 @@ public class MesProWorkOrderBomController {
         return BeanUtils.toBean(list, MesProWorkOrderBomRespVO.class, vo -> {
             MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
                 vo.setItemName(item.getName()).setItemCode(item.getCode())
-                        .setItemSpec(item.getSpecification());
+                        .setItemSpecification(item.getSpecification());
                 MapUtils.findAndThen(itemTypeMap, item.getItemTypeId(),
                         itemType -> vo.setItemOrProduct(itemType.getItemOrProduct()));
                 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
@@ -161,7 +161,7 @@ public class MesProWorkOrderController {
         return BeanUtils.toBean(list, MesProWorkOrderRespVO.class, vo -> {
             MapUtils.findAndThen(itemMap, vo.getProductId(), item -> {
                 vo.setProductName(item.getName()).setProductCode(item.getCode())
-                        .setProductSpec(item.getSpecification());
+                        .setProductSpecification(item.getSpecification());
                 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
                         unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
             });
@@ -19,7 +19,7 @@ public class MesProWorkOrderItemRespVO {
     private String itemName;
     @Schema(description = "规格型号", example = "0603")
-    private String itemSpec;
+    private String itemSpecification;
     @Schema(description = "单位名称", example = "个")
     private String unitMeasureName;
@@ -55,7 +55,7 @@ public class MesProWorkOrderRespVO {
     @Schema(description = "规格型号", example = "100x200mm")
     @ExcelProperty("规格型号")
-    private String productSpec;
+    private String productSpecification;
     @Schema(description = "单位名称", example = "个")
     @ExcelProperty("单位")
@@ -33,7 +33,7 @@ public class MesProWorkOrderBomRespVO {
     @Schema(description = "规格型号", example = "10K 0603")
     @ExcelProperty("规格型号")
-    private String itemSpec;
+    private String itemSpecification;
     @Schema(description = "单位编号", example = "300")
     private Long unitMeasureId;
@@ -25,7 +25,7 @@ public class MesTmToolPageReqVO extends PageParam {
     private String brand;
     @Schema(description = "型号规格", example = "M5-100")
-    private String spec;
+    private String specification;
     @Schema(description = "状态", example = "1")
     private Integer status;
@@ -33,7 +33,7 @@ public class MesTmToolRespVO {
     @Schema(description = "型号规格", example = "M5-100")
     @ExcelProperty("型号规格")
-    private String spec;
+    private String specification;
     @Schema(description = "工具类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     private Long toolTypeId;
@@ -31,7 +31,7 @@ public class MesTmToolSaveReqVO {
     @Schema(description = "型号规格", example = "M5-100")
     @Size(max = 255, message = "型号规格长度不能超过 255 个字符")
-    private String spec;
+    private String specification;
     @Schema(description = "工具类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     @NotNull(message = "工具类型不能为空")
@@ -44,7 +44,7 @@ public class MesDvMachineryDO extends BaseDO {
     /**
      * 规格型号
      */
-    private String spec;
+    private String specification;
     /**
      * 设备类型编号
      *
@@ -46,7 +46,7 @@ public class MesTmToolDO extends BaseDO {
     /**
      * 型号规格
      */
-    private String spec;
+    private String specification;
     /**
      * 工具类型编号
      *
@@ -21,7 +21,7 @@ public interface MesTmToolMapper extends BaseMapperX&lt;MesTmToolDO&gt; {
                 .likeIfPresent(MesTmToolDO::getName, reqVO.getName())
                 .eqIfPresent(MesTmToolDO::getToolTypeId, reqVO.getToolTypeId())
                 .likeIfPresent(MesTmToolDO::getBrand, reqVO.getBrand())
-                .likeIfPresent(MesTmToolDO::getSpec, reqVO.getSpec())
+                .likeIfPresent(MesTmToolDO::getSpecification, reqVO.getSpecification())
                 .eqIfPresent(MesTmToolDO::getStatus, reqVO.getStatus())
                 .orderByDesc(MesTmToolDO::getId));
     }