From 66f89161b834d6457858ea758b851df62a46a82d Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Sat, 18 Apr 2026 19:32:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E3=80=81=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QmsStandardDefectControllerService.java | 45 ------------------- .../pojo/qo/QmsStandardDefectUpdateQO.java | 11 ----- .../mapper/QmsSupplierSqeMapMapper.xml | 16 ++----- 3 files changed, 3 insertions(+), 69 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsStandardDefectControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsStandardDefectControllerService.java index e264537a..5011c4f9 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsStandardDefectControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsStandardDefectControllerService.java @@ -147,37 +147,6 @@ public class QmsStandardDefectControllerService { updateChain.set(QmsStandardDefect::getRemark, request.getRemark()); } - // 父级变更：仅当 changeParent=true 时处理 - boolean parentChanged = false; - Long oldParentId = exist.getParentId(); - if (Boolean.TRUE.equals(request.getChangeParent())) { - Long newParentId = null; - String newParentCode = null; - Short newLevel; - - if (StrUtil.isBlank(request.getParentName())) { - // 改为顶级 - newLevel = 1; - } else { - QmsStandardDefect newParent = getParentByName(request.getParentName()); - newParentId = newParent.getId(); - newParentCode = newParent.getDefectCode(); - newLevel = (short) (newParent.getLevel() + 1); - // 新父级若是叶子节点，改为非叶子 - if (Boolean.TRUE.equals(newParent.getIsLeaf())) { - defectService.lambdaUpdate() - .eq(QmsStandardDefect::getId, newParent.getId()) - .set(QmsStandardDefect::getIsLeaf, false) - .update(); - } - } - - parentChanged = !Objects.equals(oldParentId, newParentId); - updateChain.set(QmsStandardDefect::getParentId, newParentId) - .set(QmsStandardDefect::getParentCode, newParentCode) - .set(QmsStandardDefect::getLevel, newLevel); - } - updateChain.set(QmsStandardDefect::getUpdateBy, operator) .set(QmsStandardDefect::getUpdateTime, now) .update(); @@ -186,20 +155,6 @@ public class QmsStandardDefectControllerService { if (Objects.nonNull(request.getEnable())) { updateDescendantsEnable(request.getId(), request.getEnable(), operator, now); } - - // 若父级变更，检查旧父级是否还有未删除子节点，没有则恢复 isLeaf=true - if (parentChanged && Objects.nonNull(oldParentId)) { - boolean hasChildren = defectService.lambdaQuery() - .eq(QmsStandardDefect::getParentId, oldParentId) - .eq(QmsStandardDefect::getDeleted, false) - .exists(); - if (!hasChildren) { - defectService.lambdaUpdate() - .eq(QmsStandardDefect::getId, oldParentId) - .set(QmsStandardDefect::getIsLeaf, true) - .update(); - } - } } // ========================= 删除（逻辑删除） ========================= diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsStandardDefectUpdateQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsStandardDefectUpdateQO.java index 0f24dcb6..cbbb10b6 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsStandardDefectUpdateQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsStandardDefectUpdateQO.java @@ -15,17 +15,6 @@ public class QmsStandardDefectUpdateQO { @NotNull(message = "ID不能为空") private Long id; - /** - * 父级缺陷名称（传 null 表示顶级；变更父级时自动处理旧父级 isLeaf；不传则不修改父级） - */ - private String parentName; - - /** - * 是否修改父级（true=修改父级关系，false=不修改） - * 用于区分"不传parentName"是顶级还是不修改 - */ - private Boolean changeParent; - /** * 缺陷代码（不传则不修改） */ diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsSupplierSqeMapMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsSupplierSqeMapMapper.xml index b9d32b5a..abd19a14 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsSupplierSqeMapMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsSupplierSqeMapMapper.xml @@ -5,24 +5,13 @@ From 121fda445492028d22c91d5825beb1ad94c4e1e1 Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Mon, 20 Apr 2026 08:00:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QmsSupplierSqeController.java | 14 +++--- .../common/pojo/vo/QmsSupplierSqeMapVO.java | 48 ++----------------- .../service/IQmsSupplierSqeMapService.java | 8 ++-- .../impl/QmsSupplierSqeMapServiceImpl.java | 30 +++++++----- .../mapper/QmsSupplierSqeMapMapper.xml | 3 +- 5 files changed, 34 insertions(+), 69 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsSupplierSqeController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsSupplierSqeController.java index 06fe35ab..57ca31c4 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsSupplierSqeController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsSupplierSqeController.java @@ -59,24 +59,26 @@ public class QmsSupplierSqeController extends BaseController { } /** - * 启用/禁用供应商-用户关联关系 + * 启用/禁用供应商所有关联关系 + * + * @param request id=供应商ID，enable=启用/禁用 */ @Transactional @PostMapping("enable") public ApiResult enable(@Valid @RequestBody EnableQO request) { - supplierSqeMapService.enable(request.getId(), request.getEnable()); + supplierSqeMapService.enableBySupplierId(request.getId(), request.getEnable()); return ApiResult.success(); } /** - * 删除供应商-用户关联关系（启用状态下不允许删除） + * 删除供应商所有关联关系（启用状态下不允许删除） * - * @param id 关联记录ID + * @param supplierId 供应商ID */ @Transactional @PostMapping("delete") - public ApiResult delete(@NotNull Long id) { - supplierSqeMapService.deleteById(id); + public ApiResult delete(@NotNull Long supplierId) { + supplierSqeMapService.deleteBySupplierId(supplierId); return ApiResult.success(); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsSupplierSqeMapVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsSupplierSqeMapVO.java index 64a8809e..15e3876d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsSupplierSqeMapVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsSupplierSqeMapVO.java @@ -2,19 +2,12 @@ package com.nflg.wms.common.pojo.vo; import lombok.Data; -import java.time.LocalDateTime; - /** - * 供应商-用户 关联记录 VO（以关联表为主体，每行一条关联记录） + * 供应商-用户 关联 VO（按供应商聚合，每行一个供应商） */ @Data public class QmsSupplierSqeMapVO { - /** - * 关联记录ID（qms_supplier_sqe_map.id） - */ - private Long id; - /** * 供应商ID */ @@ -31,47 +24,12 @@ public class QmsSupplierSqeMapVO { private String supplierName; /** - * 用户ID - */ - private Long userId; - - /** - * 用户名称 + * SQE用户名称（多个用逗号分隔） */ private String userName; /** - * 用户工号 - */ - private String userCode; - - /** - * 职位名称 - */ - private String positionName; - - /** - * 启用状态：true=启用，false=禁用 + * 统一启用状态：所有关联记录均启用时为true，否则为false */ private Boolean enable; - - /** - * 创建人 - */ - private String createBy; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 最后更新人 - */ - private String updateBy; - - /** - * 最后更新时间 - */ - private LocalDateTime updateTime; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsSupplierSqeMapService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsSupplierSqeMapService.java index b793403b..4e6cc93b 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsSupplierSqeMapService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsSupplierSqeMapService.java @@ -37,14 +37,14 @@ public interface IQmsSupplierSqeMapService extends IService { void setUser(Long supplierId, List userIds); /** - * 启用/禁用单条供应商-用户关联 + * 按供应商ID启用/禁用该供应商所有关联记录 */ - void enable(Long id, Boolean enable); + void enableBySupplierId(Long supplierId, Boolean enable); /** - * 删除单条供应商-用户关联（启用状态下不允许删除） + * 按供应商ID删除该供应商所有关联记录（启用状态下不允许删除） */ - void deleteById(Long id); + void deleteBySupplierId(Long supplierId); /** * 按 userId 查询该用户关联的供应商列表（支持供应商过滤，分页） diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsSupplierSqeMapServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsSupplierSqeMapServiceImpl.java index 373eedc2..77a938ce 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsSupplierSqeMapServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsSupplierSqeMapServiceImpl.java @@ -99,13 +99,15 @@ public class QmsSupplierSqeMapServiceImpl extends ServiceImpl Date: Mon, 20 Apr 2026 08:21:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QmsSupplierSqeController.java | 8 ++++---- .../wms/common/pojo/qo/EnableSupplierQO.java | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/EnableSupplierQO.java diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsSupplierSqeController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsSupplierSqeController.java index 57ca31c4..6506c8f8 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsSupplierSqeController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsSupplierSqeController.java @@ -3,7 +3,7 @@ package com.nflg.qms.admin.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; -import com.nflg.wms.common.pojo.qo.EnableQO; +import com.nflg.wms.common.pojo.qo.EnableSupplierQO; import com.nflg.wms.common.pojo.qo.QmsSupplierSqeSearchQO; import com.nflg.wms.common.pojo.qo.QmsSetSupplierQO; import com.nflg.wms.common.pojo.qo.QmsSetUserQO; @@ -61,12 +61,12 @@ public class QmsSupplierSqeController extends BaseController { /** * 启用/禁用供应商所有关联关系 * - * @param request id=供应商ID，enable=启用/禁用 + * @param request supplierId=供应商ID，enable=启用/禁用 */ @Transactional @PostMapping("enable") - public ApiResult enable(@Valid @RequestBody EnableQO request) { - supplierSqeMapService.enableBySupplierId(request.getId(), request.getEnable()); + public ApiResult enable(@Valid @RequestBody EnableSupplierQO request) { + supplierSqeMapService.enableBySupplierId(request.getSupplierId(), request.getEnable()); return ApiResult.success(); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/EnableSupplierQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/EnableSupplierQO.java new file mode 100644 index 00000000..747be315 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/EnableSupplierQO.java @@ -0,0 +1,16 @@ +package com.nflg.wms.common.pojo.qo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class EnableSupplierQO { + + // 供应商ID + @NotNull + private Long supplierId; + + // 是否启用 + @NotNull + private Boolean enable; +}