rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'qms/yf' into qms/develop

This commit is contained in:
funny 2026-04-10 14:20:50 +08:00
parent e01e1deabf e3c404bdef
commit aa40e6c935
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsStandardDefectControllerService.java
View File

@ -56,7 +56,7 @@ public class QmsStandardDefectControllerService {
// 校验 defect_code 唯一性 // 校验 defect_code 唯一性
boolean codeExists = defectService.lambdaQuery() boolean codeExists = defectService.lambdaQuery()
.eq(QmsStandardDefect::getDefectCode, request.getDefectCode()) .eq(QmsStandardDefect::getDefectCode, request.getDefectCode())
.eq(QmsStandardDefect::getDeleted, true) .eq(QmsStandardDefect::getDeleted, false)
.exists(); .exists();
if (codeExists) { if (codeExists) {
throw new NflgException(STATE.BusinessError, "缺陷代码已存在：" + request.getDefectCode()); throw new NflgException(STATE.BusinessError, "缺陷代码已存在：" + request.getDefectCode());
@ -67,7 +67,7 @@ public class QmsStandardDefectControllerService {
.setDefectName(request.getDefectName()) .setDefectName(request.getDefectName())
.setState(request.getState()) .setState(request.getState())
.setRemark(request.getRemark()) .setRemark(request.getRemark())
.setDeleted(true) .setDeleted(false)
.setCreateBy(operator) .setCreateBy(operator)
.setCreateTime(now) .setCreateTime(now)
.setUpdateBy(operator) .setUpdateBy(operator)
@ -117,7 +117,7 @@ public class QmsStandardDefectControllerService {
boolean codeExists = defectService.lambdaQuery() boolean codeExists = defectService.lambdaQuery()
.eq(QmsStandardDefect::getDefectCode, request.getDefectCode()) .eq(QmsStandardDefect::getDefectCode, request.getDefectCode())
.ne(QmsStandardDefect::getId, request.getId()) .ne(QmsStandardDefect::getId, request.getId())
.eq(QmsStandardDefect::getDeleted, true) .eq(QmsStandardDefect::getDeleted, false)
.exists(); .exists();
if (codeExists) { if (codeExists) {
throw new NflgException(STATE.BusinessError, "缺陷代码已存在：" + request.getDefectCode()); throw new NflgException(STATE.BusinessError, "缺陷代码已存在：" + request.getDefectCode());
@ -183,7 +183,7 @@ public class QmsStandardDefectControllerService {
if (parentChanged && Objects.nonNull(oldParentId)) { if (parentChanged && Objects.nonNull(oldParentId)) {
boolean hasChildren = defectService.lambdaQuery() boolean hasChildren = defectService.lambdaQuery()
.eq(QmsStandardDefect::getParentId, oldParentId) .eq(QmsStandardDefect::getParentId, oldParentId)
.eq(QmsStandardDefect::getDeleted, true) .eq(QmsStandardDefect::getDeleted, false)
.exists(); .exists();
if (!hasChildren) { if (!hasChildren) {
defectService.lambdaUpdate() defectService.lambdaUpdate()
@ -197,7 +197,7 @@ public class QmsStandardDefectControllerService {
// ========================= 删除（逻辑删除） ========================= // ========================= 删除（逻辑删除） =========================
/** /**
* 逻辑删除（deleted: 1->0），同时检查旧父级是否需要恢复 isLeaf * 逻辑删除（deleted: 0->1），同时检查旧父级是否需要恢复 isLeaf
*/ */
@Transactional @Transactional
public void delete(Long id) { public void delete(Long id) {
@ -208,7 +208,7 @@ public class QmsStandardDefectControllerService {
// 逻辑删除 // 逻辑删除
defectService.lambdaUpdate() defectService.lambdaUpdate()
.eq(QmsStandardDefect::getId, id) .eq(QmsStandardDefect::getId, id)
.set(QmsStandardDefect::getDeleted, false) .set(QmsStandardDefect::getDeleted, true)
.set(QmsStandardDefect::getUpdateBy, UserUtil.getUserName()) .set(QmsStandardDefect::getUpdateBy, UserUtil.getUserName())
.set(QmsStandardDefect::getUpdateTime, LocalDateTime.now()) .set(QmsStandardDefect::getUpdateTime, LocalDateTime.now())
.update(); .update();
@ -217,7 +217,7 @@ public class QmsStandardDefectControllerService {
if (Objects.nonNull(exist.getParentId())) { if (Objects.nonNull(exist.getParentId())) {
boolean hasChildren = defectService.lambdaQuery() boolean hasChildren = defectService.lambdaQuery()
.eq(QmsStandardDefect::getParentId, exist.getParentId()) .eq(QmsStandardDefect::getParentId, exist.getParentId())
.eq(QmsStandardDefect::getDeleted, true) .eq(QmsStandardDefect::getDeleted, false)
.exists(); .exists();
if (!hasChildren) { if (!hasChildren) {
defectService.lambdaUpdate() defectService.lambdaUpdate()
@ -236,9 +236,9 @@ public class QmsStandardDefectControllerService {
* 无查询条件时：直接全量构建树 * 无查询条件时：直接全量构建树
*/ */
public PageData<QmsStandardDefectVO> search(QmsStandardDefectSearchQO request) { public PageData<QmsStandardDefectVO> search(QmsStandardDefectSearchQO request) {
// 查询所有 deleted=true 的记录（按 id 建 map 方便查找祖先） // 查询所有 deleted=false 的记录（按 id 建 map 方便查找祖先）
List<QmsStandardDefect> all = defectService.lambdaQuery() List<QmsStandardDefect> all = defectService.lambdaQuery()
.eq(QmsStandardDefect::getDeleted, true) .eq(QmsStandardDefect::getDeleted, false)
.list(); .list();
boolean hasCondition = StrUtil.isNotBlank(request.getDefectCode()) boolean hasCondition = StrUtil.isNotBlank(request.getDefectCode())
@ -298,7 +298,7 @@ public class QmsStandardDefectControllerService {
*/ */
public List<QmsStandardDefectVO> listForExport(List<Long> ids) { public List<QmsStandardDefectVO> listForExport(List<Long> ids) {
var query = defectService.lambdaQuery() var query = defectService.lambdaQuery()
.eq(QmsStandardDefect::getDeleted, true); .eq(QmsStandardDefect::getDeleted, 0);
if (ids != null && !ids.isEmpty()) { if (ids != null && !ids.isEmpty()) {
query.in(QmsStandardDefect::getId, ids); query.in(QmsStandardDefect::getId, ids);
} }
@ -337,12 +337,12 @@ public class QmsStandardDefectControllerService {
// ========================= 私有工具方法 ========================= // ========================= 私有工具方法 =========================
/** /**
* 按 defectName 查询父级（deleted=true），不存在则抛出异常 * 按 defectName 查询父级（deleted=0），不存在则抛出异常
*/ */
private QmsStandardDefect getParentByName(String parentName) { private QmsStandardDefect getParentByName(String parentName) {
QmsStandardDefect parent = defectService.lambdaQuery() QmsStandardDefect parent = defectService.lambdaQuery()
.eq(QmsStandardDefect::getDefectName, parentName) .eq(QmsStandardDefect::getDefectName, parentName)
.eq(QmsStandardDefect::getDeleted, true) .eq(QmsStandardDefect::getDeleted, false)
.one(); .one();
if (Objects.isNull(parent)) { if (Objects.isNull(parent)) {
throw new NflgException(STATE.BusinessError, "父级故障名称不存在：" + parentName); throw new NflgException(STATE.BusinessError, "父级故障名称不存在：" + parentName);
@ -358,12 +358,12 @@ public class QmsStandardDefectControllerService {
if (Objects.isNull(parentId)) { if (Objects.isNull(parentId)) {
siblings = defectService.lambdaQuery() siblings = defectService.lambdaQuery()
.isNull(QmsStandardDefect::getParentId) .isNull(QmsStandardDefect::getParentId)
.eq(QmsStandardDefect::getDeleted, true) .eq(QmsStandardDefect::getDeleted, false)
.list(); .list();
} else { } else {
siblings = defectService.lambdaQuery() siblings = defectService.lambdaQuery()
.eq(QmsStandardDefect::getParentId, parentId) .eq(QmsStandardDefect::getParentId, parentId)
.eq(QmsStandardDefect::getDeleted, true) .eq(QmsStandardDefect::getDeleted, false)
.list(); .list();
} }
return (short) (siblings.size() + 1); return (short) (siblings.size() + 1);

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsStandardDefect.java
View File

@ -97,7 +97,7 @@ public class QmsStandardDefect implements Serializable {
private LocalDateTime updateTime; private LocalDateTime updateTime;
/** /**
* 逻辑删除：true=未删除，false=已删除 * 逻辑删除：false=未删除，true=已删除
*/ */
private Boolean deleted; private Boolean deleted;
} }