BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 1be6bcfe9d684a880ddcda95be332f2a2a86e0a3

Authored by YunaiV
1 parent a5e130d1

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

Inline Side-by-side
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
  View file @1be6bcf
... ... @@ -75,7 +75,7 @@ public class MesDvCheckPlanMachineryController {
75 75 return BeanUtils.toBean(list, MesDvCheckPlanMachineryRespVO.class, vo ->
76 76 MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery ->
77 77 vo.setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName())
78   - .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec())
  78 + .setMachineryBrand(machinery.getBrand()).setMachinerySpecification(machinery.getSpecification())
79 79 )
80 80 );
81 81 }
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkplan/vo/machinery/MesDvCheckPlanMachineryRespVO.java
  View file @1be6bcf
... ... @@ -28,7 +28,7 @@ public class MesDvCheckPlanMachineryRespVO {
28 28 private String machineryBrand;
29 29  
30 30 @Schema(description = "规格型号", example = "HTF120")
31   - private String machinerySpec;
  31 + private String machinerySpecification;
32 32  
33 33 @Schema(description = "备注")
34 34 private String remark;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java
  View file @1be6bcf
... ... @@ -141,7 +141,7 @@ public class MesDvCheckRecordController {
141 141 .setPlanCycleType(plan.getCycleType()).setPlanCycleCount(plan.getCycleCount()));
142 142 MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery -> vo
143 143 .setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName())
144   - .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec()));
  144 + .setMachineryBrand(machinery.getBrand()).setMachinerySpecification(machinery.getSpecification()));
145 145 MapUtils.findAndThen(userMap, vo.getUserId(),
146 146 user -> vo.setNickname(user.getNickname()));
147 147 });
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/vo/MesDvCheckRecordRespVO.java
  View file @1be6bcf
... ... @@ -64,7 +64,7 @@ public class MesDvCheckRecordRespVO {
64 64  
65 65 @Schema(description = "规格型号", example = "X-100")
66 66 @ExcelProperty("规格型号")
67   - private String machinerySpec;
  67 + private String machinerySpecification;
68 68  
69 69 @Schema(description = "点检时间", requiredMode = Schema.RequiredMode.REQUIRED)
70 70 @ExcelProperty("点检时间")
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
  View file @1be6bcf
... ... @@ -124,7 +124,7 @@ public class MesDvMachineryController {
124 124 // 手动创建导出 demo
125 125 List<MesDvMachineryImportExcelVO> list = Collections.singletonList(
126 126 MesDvMachineryImportExcelVO.builder().code("EQ-001").name("示例设备")
127   - .brand("示例品牌").spec("型号A").machineryTypeCode("MT-001")
  127 + .brand("示例品牌").specification("型号A").machineryTypeCode("MT-001")
128 128 .workshopCode("WS-001").status(0).build()
129 129 );
130 130 // 输出
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java
  View file @1be6bcf
... ... @@ -28,7 +28,7 @@ public class MesDvMachineryImportExcelVO {
28 28 private String brand;
29 29  
30 30 @ExcelProperty("规格型号")
31   - private String spec;
  31 + private String specification;
32 32  
33 33 @ExcelProperty("设备类型编码")
34 34 private String machineryTypeCode;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryRespVO.java
  View file @1be6bcf
... ... @@ -33,7 +33,7 @@ public class MesDvMachineryRespVO {
33 33  
34 34 @Schema(description = "规格型号", example = "S7-300")
35 35 @ExcelProperty("规格型号")
36   - private String spec;
  36 + private String specification;
37 37  
38 38 @Schema(description = "设备类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
39 39 private Long machineryTypeId;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachinerySaveReqVO.java
  View file @1be6bcf
... ... @@ -26,7 +26,7 @@ public class MesDvMachinerySaveReqVO {
26 26 private String brand;
27 27  
28 28 @Schema(description = "规格型号", example = "S7-300")
29   - private String spec;
  29 + private String specification;
30 30  
31 31 @Schema(description = "设备类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
32 32 @NotNull(message = "设备类型不能为空")
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java
  View file @1be6bcf
... ... @@ -144,7 +144,7 @@ public class MesDvMaintenRecordController {
144 144 .setPlanCycleCount(plan.getCycleCount()));
145 145 MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery -> vo
146 146 .setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName())
147   - .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec()));
  147 + .setMachineryBrand(machinery.getBrand()).setMachinerySpecification(machinery.getSpecification()));
148 148 MapUtils.findAndThen(userMap, vo.getUserId(),
149 149 user -> vo.setNickname(user.getNickname()));
150 150 });
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/vo/MesDvMaintenRecordRespVO.java
  View file @1be6bcf
... ... @@ -64,7 +64,7 @@ public class MesDvMaintenRecordRespVO {
64 64  
65 65 @Schema(description = "规格型号", example = "X-100")
66 66 @ExcelProperty("规格型号")
67   - private String machinerySpec;
  67 + private String machinerySpecification;
68 68  
69 69 @Schema(description = "保养时间", requiredMode = Schema.RequiredMode.REQUIRED)
70 70 @ExcelProperty("保养时间")
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java
  View file @1be6bcf
... ... @@ -159,7 +159,7 @@ public class MesDvRepairController {
159 159 return BeanUtils.toBean(list, MesDvRepairRespVO.class, vo -> {
160 160 MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery -> vo
161 161 .setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName())
162   - .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec()));
  162 + .setMachineryBrand(machinery.getBrand()).setMachinerySpecification(machinery.getSpecification()));
163 163 MapUtils.findAndThen(userMap, vo.getAcceptedUserId(),
164 164 user -> vo.setAcceptedUserNickname(user.getNickname()));
165 165 MapUtils.findAndThen(userMap, vo.getConfirmUserId(),
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/vo/MesDvRepairRespVO.java
  View file @1be6bcf
... ... @@ -44,7 +44,7 @@ public class MesDvRepairRespVO {
44 44  
45 45 @Schema(description = "规格型号", example = "X-100")
46 46 @ExcelProperty("规格型号")
47   - private String machinerySpec;
  47 + private String machinerySpecification;
48 48  
49 49 @Schema(description = "报修日期")
50 50 @ExcelProperty("报修日期")
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
  View file @1be6bcf
... ... @@ -240,7 +240,7 @@ public class MesProTaskController {
240 240 findAndThen(processMap, task.getProcessId(), p ->
241 241 vo.setProcessName(p.getName()));
242 242 findAndThen(itemMap, task.getItemId(), item ->
243   - vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpec(item.getSpecification()));
  243 + vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification()));
244 244 findAndThen(clientMap, task.getClientId(), c ->
245 245 vo.setClientName(c.getName()));
246 246 findAndThen(routeProcessCheckFlagMap, task.getRouteId(), processCheckMap ->
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskIssueController.java
  View file @1be6bcf
... ... @@ -113,7 +113,7 @@ public class MesProTaskIssueController {
113 113 return cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList(list, issue -> {
114 114 MesProTaskIssueRespVO vo = BeanUtils.toBean(issue, MesProTaskIssueRespVO.class);
115 115 findAndThen(itemMap, issue.getItemId(), item ->
116   - vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpec(item.getSpecification()));
  116 + vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification()));
117 117 findAndThen(unitMap, issue.getUnitMeasureId(), unit ->
118 118 vo.setUnitMeasureName(unit.getName()));
119 119 return vo;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskIssueRespVO.java
  View file @1be6bcf
... ... @@ -47,7 +47,7 @@ public class MesProTaskIssueRespVO {
47 47 private String itemName;
48 48  
49 49 @Schema(description = "规格型号", example = "100x200mm")
50   - private String itemSpec;
  50 + private String itemSpecification;
51 51  
52 52 @Schema(description = "单位编号", example = "1")
53 53 private Long unitMeasureId;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java
  View file @1be6bcf
... ... @@ -56,7 +56,7 @@ public class MesProTaskRespVO {
56 56 private String itemName;
57 57  
58 58 @Schema(description = "规格型号", example = "100x200mm")
59   - private String itemSpec;
  59 + private String itemSpecification;
60 60  
61 61 @Schema(description = "排产数量", example = "100.00")
62 62 private BigDecimal quantity;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java
  View file @1be6bcf
... ... @@ -128,7 +128,7 @@ public class MesProWorkOrderBomController {
128 128 }
129 129 MesProWorkOrderItemRespVO vo = new MesProWorkOrderItemRespVO()
130 130 .setItemId(item.getId()).setQuantity(entry.getValue())
131   - .setItemCode(item.getCode()).setItemName(item.getName()).setItemSpec(item.getSpecification());
  131 + .setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification());
132 132 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
133 133 unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
134 134 MapUtils.findAndThen(itemTypeMap, item.getItemTypeId(),
... ... @@ -155,7 +155,7 @@ public class MesProWorkOrderBomController {
155 155 return BeanUtils.toBean(list, MesProWorkOrderBomRespVO.class, vo -> {
156 156 MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
157 157 vo.setItemName(item.getName()).setItemCode(item.getCode())
158   - .setItemSpec(item.getSpecification());
  158 + .setItemSpecification(item.getSpecification());
159 159 MapUtils.findAndThen(itemTypeMap, item.getItemTypeId(),
160 160 itemType -> vo.setItemOrProduct(itemType.getItemOrProduct()));
161 161 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
  View file @1be6bcf
... ... @@ -161,7 +161,7 @@ public class MesProWorkOrderController {
161 161 return BeanUtils.toBean(list, MesProWorkOrderRespVO.class, vo -> {
162 162 MapUtils.findAndThen(itemMap, vo.getProductId(), item -> {
163 163 vo.setProductName(item.getName()).setProductCode(item.getCode())
164   - .setProductSpec(item.getSpecification());
  164 + .setProductSpecification(item.getSpecification());
165 165 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
166 166 unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
167 167 });
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderItemRespVO.java
  View file @1be6bcf
... ... @@ -19,7 +19,7 @@ public class MesProWorkOrderItemRespVO {
19 19 private String itemName;
20 20  
21 21 @Schema(description = "规格型号", example = "0603")
22   - private String itemSpec;
  22 + private String itemSpecification;
23 23  
24 24 @Schema(description = "单位名称", example = "个")
25 25 private String unitMeasureName;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderRespVO.java
  View file @1be6bcf
... ... @@ -55,7 +55,7 @@ public class MesProWorkOrderRespVO {
55 55  
56 56 @Schema(description = "规格型号", example = "100x200mm")
57 57 @ExcelProperty("规格型号")
58   - private String productSpec;
  58 + private String productSpecification;
59 59  
60 60 @Schema(description = "单位名称", example = "个")
61 61 @ExcelProperty("单位")
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkOrderBomRespVO.java
  View file @1be6bcf
... ... @@ -33,7 +33,7 @@ public class MesProWorkOrderBomRespVO {
33 33  
34 34 @Schema(description = "规格型号", example = "10K 0603")
35 35 @ExcelProperty("规格型号")
36   - private String itemSpec;
  36 + private String itemSpecification;
37 37  
38 38 @Schema(description = "单位编号", example = "300")
39 39 private Long unitMeasureId;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/vo/MesTmToolPageReqVO.java
  View file @1be6bcf
... ... @@ -25,7 +25,7 @@ public class MesTmToolPageReqVO extends PageParam {
25 25 private String brand;
26 26  
27 27 @Schema(description = "型号规格", example = "M5-100")
28   - private String spec;
  28 + private String specification;
29 29  
30 30 @Schema(description = "状态", example = "1")
31 31 private Integer status;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/vo/MesTmToolRespVO.java
  View file @1be6bcf
... ... @@ -33,7 +33,7 @@ public class MesTmToolRespVO {
33 33  
34 34 @Schema(description = "型号规格", example = "M5-100")
35 35 @ExcelProperty("型号规格")
36   - private String spec;
  36 + private String specification;
37 37  
38 38 @Schema(description = "工具类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
39 39 private Long toolTypeId;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/vo/MesTmToolSaveReqVO.java
  View file @1be6bcf
... ... @@ -31,7 +31,7 @@ public class MesTmToolSaveReqVO {
31 31  
32 32 @Schema(description = "型号规格", example = "M5-100")
33 33 @Size(max = 255, message = "型号规格长度不能超过 255 个字符")
34   - private String spec;
  34 + private String specification;
35 35  
36 36 @Schema(description = "工具类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
37 37 @NotNull(message = "工具类型不能为空")
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/machinery/MesDvMachineryDO.java
  View file @1be6bcf
... ... @@ -44,7 +44,7 @@ public class MesDvMachineryDO extends BaseDO {
44 44 /**
45 45 * 规格型号
46 46 */
47   - private String spec;
  47 + private String specification;
48 48 /**
49 49 * 设备类型编号
50 50 *
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/tm/tool/MesTmToolDO.java
  View file @1be6bcf
... ... @@ -46,7 +46,7 @@ public class MesTmToolDO extends BaseDO {
46 46 /**
47 47 * 型号规格
48 48 */
49   - private String spec;
  49 + private String specification;
50 50 /**
51 51 * 工具类型编号
52 52 *
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/tm/tool/MesTmToolMapper.java
  View file @1be6bcf
... ... @@ -21,7 +21,7 @@ public interface MesTmToolMapper extends BaseMapperX&lt;MesTmToolDO&gt; {
21 21 .likeIfPresent(MesTmToolDO::getName, reqVO.getName())
22 22 .eqIfPresent(MesTmToolDO::getToolTypeId, reqVO.getToolTypeId())
23 23 .likeIfPresent(MesTmToolDO::getBrand, reqVO.getBrand())
24   - .likeIfPresent(MesTmToolDO::getSpec, reqVO.getSpec())
  24 + .likeIfPresent(MesTmToolDO::getSpecification, reqVO.getSpecification())
25 25 .eqIfPresent(MesTmToolDO::getStatus, reqVO.getStatus())
26 26 .orderByDesc(MesTmToolDO::getId));
27 27 }
... ...