diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiComponentControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiComponentControllerService.java index a89fedd4..c3ec7f7b 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiComponentControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiComponentControllerService.java @@ -51,10 +51,9 @@ public class QmsPdiComponentControllerService { public void add(QmsPdiComponentAddQO request) { QmsPdiComponentAnagement entity = new QmsPdiComponentAnagement() .setComponentName(request.getComponentName()) - .setDeliveryRulesId(request.getDeliveryRulesId()) .setDetectionRulesId(request.getDetectionRulesId()) .setCreateBy(UserUtil.getUserName()) - .setCreaeteTime(LocalDateTime.now()); + .setCreateTime(LocalDateTime.now()); componentService.save(entity); } @@ -74,9 +73,6 @@ public class QmsPdiComponentControllerService { if (StrUtil.isNotBlank(request.getComponentName())) { updateChain.set(QmsPdiComponentAnagement::getComponentName, request.getComponentName()); } - if (Objects.nonNull(request.getDeliveryRulesId())) { - updateChain.set(QmsPdiComponentAnagement::getDeliveryRulesId, request.getDeliveryRulesId()); - } updateChain.update(); } diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiDetectionRulesControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiDetectionRulesControllerService.java index 20ab8a62..06e1863c 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiDetectionRulesControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiDetectionRulesControllerService.java @@ -258,10 +258,9 @@ public class QmsPdiDetectionRulesControllerService { List newComponents = components.stream() .map(item -> new QmsPdiComponentAnagement() .setDetectionRulesId(newId) - .setDeliveryRulesId(item.getDeliveryRulesId()) .setComponentName(item.getComponentName()) .setCreateBy(operator) - .setCreaeteTime(now)) + .setCreateTime(now)) .collect(java.util.stream.Collectors.toList()); componentService.saveBatch(newComponents); } diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java index 491a0838..779d7d8c 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java @@ -101,7 +101,7 @@ public class QmsPdiStatusItemControllerService { component.setDetectionRulesId(request.getDetectionRulesId()); component.setSort(maxComponentSort + 1); component.setCreateBy(operator); - component.setCreaeteTime(now); + component.setCreateTime(now); componentAnagementService.save(component); componentsId = component.getId(); @@ -342,12 +342,14 @@ public class QmsPdiStatusItemControllerService { } else { // 新部件,插入到部件表 currentComponentSort++; + // 部件名称:如果以英文字母结束,追加换行符 + String componentName = appendNewlineIfEndsWithEnglish(dto.getComponentsDes()); QmsPdiComponentAnagement component = new QmsPdiComponentAnagement(); - component.setComponentName(dto.getComponentsDes()); + component.setComponentName(componentName); component.setDetectionRulesId(detectionRulesId); component.setSort(currentComponentSort); component.setCreateBy(operator); - component.setCreaeteTime(now); + component.setCreateTime(now); componentAnagementService.save(component); componentsId = component.getId(); @@ -359,13 +361,7 @@ public class QmsPdiStatusItemControllerService { } // 处理检查核实内容:如果以英文字母结束,追加换行符 - String content = dto.getInspectionContent(); - if (StrUtil.isNotBlank(content)) { - char lastChar = content.charAt(content.length() - 1); - if ((lastChar >= 'a' && lastChar <= 'z') || (lastChar >= 'A' && lastChar <= 'Z')) { - dto.setInspectionContent(content + "\n"); - } - } + dto.setInspectionContent(appendNewlineIfEndsWithEnglish(dto.getInspectionContent())); // 插入检测项 int itemSort = componentItemCountMap.getOrDefault(componentsId, 0) + 1; @@ -386,6 +382,20 @@ public class QmsPdiStatusItemControllerService { markMaintained(detectionRulesId); } + /** + * 如果文本以英文字母结尾,则追加换行符 + */ + private String appendNewlineIfEndsWithEnglish(String text) { + if (StrUtil.isBlank(text)) { + return text; + } + char lastChar = text.charAt(text.length() - 1); + if ((lastChar >= 'a' && lastChar <= 'z') || (lastChar >= 'A' && lastChar <= 'Z')) { + return text + "\n"; + } + return text; + } + // ========================= 分页查询 ========================= /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentAddQO.java index fedfeebf..0e7b5ec4 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentAddQO.java @@ -16,12 +16,6 @@ public class QmsPdiComponentAddQO { @NotBlank(message = "部件名称不能为空") private String componentName; - /** - * 动静态检测项ID(必传) - */ - @NotNull(message = "动静态检测项ID不能为空") - private Long deliveryRulesId; - /** * PDI检测规则ID(必传) */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentUpdateQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentUpdateQO.java index 93d449bc..a9a20d38 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentUpdateQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentUpdateQO.java @@ -19,9 +19,4 @@ public class QmsPdiComponentUpdateQO { * 部件名称(可选) */ private String componentName; - - /** - * 动静态检测项ID(可选) - */ - private Long deliveryRulesId; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPdiComponentAnagement.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPdiComponentAnagement.java index 65dbb722..2c4a84f5 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPdiComponentAnagement.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPdiComponentAnagement.java @@ -31,11 +31,6 @@ public class QmsPdiComponentAnagement implements Serializable { */ private String componentName; - /** - * 动静态检测项ID - */ - private Long deliveryRulesId; - /** * PDI检测规则ID */ @@ -54,5 +49,5 @@ public class QmsPdiComponentAnagement implements Serializable { /** * 创建时间 */ - private LocalDateTime creaeteTime; + private LocalDateTime createTime; }