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] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=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<Void> 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<Void> delete(@NotNull Long id) {
-        supplierSqeMapService.deleteById(id);
+    public ApiResult<Void> 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<QmsSupplierSqeMap> {
     void setUser(Long supplierId, List<Long> 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<QmsSupplierSqeMapM
 
     @Transactional
     @Override
-    public void enable(Long id, Boolean enable) {
-        QmsSupplierSqeMap record = getById(id);
-        if (Objects.isNull(record)) {
-            throw new NflgException(STATE.BusinessError, "关联记录不存在");
+    public void enableBySupplierId(Long supplierId, Boolean enable) {
+        boolean exists = lambdaQuery()
+                .eq(QmsSupplierSqeMap::getSupplierId, supplierId)
+                .exists();
+        if (!exists) {
+            throw new NflgException(STATE.BusinessError, "该供应商无关联记录");
         }
         lambdaUpdate()
-                .eq(QmsSupplierSqeMap::getId, id)
+                .eq(QmsSupplierSqeMap::getSupplierId, supplierId)
                 .set(QmsSupplierSqeMap::getEnable, enable)
                 .set(QmsSupplierSqeMap::getUpdateBy, UserUtil.getUserName())
                 .set(QmsSupplierSqeMap::getUpdateTime, LocalDateTime.now())
@@ -114,15 +116,17 @@ public class QmsSupplierSqeMapServiceImpl extends ServiceImpl<QmsSupplierSqeMapM
 
     @Transactional
     @Override
-    public void deleteById(Long id) {
-        QmsSupplierSqeMap record = getById(id);
-        if (Objects.isNull(record)) {
-            throw new NflgException(STATE.BusinessError, "关联记录不存在");
+    public void deleteBySupplierId(Long supplierId) {
+        boolean hasEnabled = lambdaQuery()
+                .eq(QmsSupplierSqeMap::getSupplierId, supplierId)
+                .eq(QmsSupplierSqeMap::getEnable, true)
+                .exists();
+        if (hasEnabled) {
+            throw new NflgException(STATE.BusinessError, "该供应商关联关系处于启用状态，不允许删除，请先禁用后再删除");
         }
-        if (Boolean.TRUE.equals(record.getEnable())) {
-            throw new NflgException(STATE.BusinessError, "关联关系处于启用状态，不允许删除，请先禁用后再删除");
-        }
-        removeById(id);
+        lambdaUpdate()
+                .eq(QmsSupplierSqeMap::getSupplierId, supplierId)
+                .remove();
     }
 
     @Override
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsSupplierSqeMapMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsSupplierSqeMapMapper.xml
index abd19a14..fef46460 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsSupplierSqeMapMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsSupplierSqeMapMapper.xml
@@ -8,7 +8,8 @@
             qssm.supplier_id,
             us.supplier_code,
             us.supplier_name,
-            STRING_AGG(DISTINCT u.user_name, ',' ORDER BY u.user_name) AS user_name
+            STRING_AGG(DISTINCT u.user_name, ',' ORDER BY u.user_name) AS user_name,
+            BOOL_AND(qssm.enable) AS enable
         FROM qms_supplier_sqe_map qssm
         LEFT JOIN user_supplier us ON us.id = qssm.supplier_id
         LEFT JOIN "user" u ON u.id = qssm.user_id