From 34a33118f9088af538d1746c365968e72a514ec9 Mon Sep 17 00:00:00 2001 From: funny <834502597@qq.com> Date: Fri, 17 Apr 2026 09:31:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9ECOA=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E5=92=8C?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QmsInspectionItemController.java | 29 +------ .../QmsQualityInspectorController.java | 14 ++++ .../controller/QmsSupplierSqeController.java | 14 ++++ .../pojo/qo/QmsInspectionItemAddQO.java | 39 ++++++--- .../pojo/qo/QmsInspectionItemUpdateQO.java | 37 ++++++--- .../common/pojo/qo/QmsMaterialsByUserQO.java | 25 ++++++ .../common/pojo/qo/QmsUserMaterialsQO.java | 20 +++++ .../wms/common/pojo/vo/QmsUserSupplierVO.java | 35 ++++++++ .../mapper/QmsQualityInspectorMapper.java | 17 ++++ .../mapper/QmsSupplierSqeMapMapper.java | 12 +++ .../service/IQmsInspectionItemService.java | 15 +--- .../service/IQmsQualityInspectorService.java | 9 +++ .../service/IQmsSupplierSqeMapService.java | 7 ++ .../impl/QmsInspectionItemServiceImpl.java | 79 ++++++------------- .../impl/QmsQualityInspectorServiceImpl.java | 7 ++ .../impl/QmsSupplierSqeMapServiceImpl.java | 7 ++ .../mapper/QmsQualityInspectorMapper.xml | 58 ++++++++++++++ .../mapper/QmsSupplierSqeMapMapper.xml | 20 +++++ 18 files changed, 327 insertions(+), 117 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsMaterialsByUserQO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsUserMaterialsQO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsUserSupplierVO.java diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsInspectionItemController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsInspectionItemController.java index 89b2fafa..5b54f80d 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsInspectionItemController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsInspectionItemController.java @@ -10,7 +10,6 @@ import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.dto.QmsInspectionItemExportDTO; import com.nflg.wms.common.pojo.dto.QmsInspectionItemImportDTO; import com.nflg.wms.common.pojo.qo.QmsInspectionItemAddQO; -import com.nflg.wms.common.pojo.qo.QmsInspectionItemDetailAddQO; import com.nflg.wms.common.pojo.qo.QmsInspectionItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsInspectionItemUpdateQO; import com.nflg.wms.common.pojo.vo.QmsInspectionItemDetailsVO; @@ -55,7 +54,7 @@ public class QmsInspectionItemController extends BaseController { // ==================== 主表 CRUD ==================== /** - * 新增检测项（同时插入一条明细） + * 新增检测项（同时插入明细） */ @Transactional @PostMapping("add") @@ -77,7 +76,7 @@ public class QmsInspectionItemController extends BaseController { } /** - * 修改检测项 + * 修改检测项（主表 + 明细列表全量替换） */ @Transactional @PostMapping("update") @@ -86,30 +85,6 @@ public class QmsInspectionItemController extends BaseController { return ApiResult.success(); } - // ==================== 明细操作 ==================== - - /** - * 明细新增 - */ - @Transactional - @PostMapping("addDetail") - public ApiResult addDetail(@Valid @RequestBody QmsInspectionItemDetailAddQO qo) { - inspectionItemService.addDetail(qo); - return ApiResult.success(); - } - - /** - * 明细删除（批量） - * - * @param detailIds 明细ID列表 - */ - @Transactional - @PostMapping("deleteDetails") - public ApiResult deleteDetails(@RequestBody List detailIds) { - inspectionItemService.deleteDetails(detailIds); - return ApiResult.success(); - } - // ==================== 查询 ==================== /** diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsQualityInspectorController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsQualityInspectorController.java index 54dcf2cc..38a1200d 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsQualityInspectorController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsQualityInspectorController.java @@ -3,12 +3,14 @@ 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.QmsMaterialsByUserQO; import com.nflg.wms.common.pojo.qo.QmsQualityInspectorAddQO; import com.nflg.wms.common.pojo.qo.QmsQualityInspectorSearchQO; import com.nflg.wms.common.pojo.qo.QmsQualityInspectorStatusQO; import com.nflg.wms.common.pojo.qo.QmsQualityInspectorTransferQO; import com.nflg.wms.common.pojo.qo.QmsQualityInspectorUpdateQO; import com.nflg.wms.common.pojo.vo.QmsQualityInspectorDetailVO; +import com.nflg.wms.common.pojo.vo.QmsQualityInspectorMaterialVO; import com.nflg.wms.common.pojo.vo.QmsQualityInspectorVO; import com.nflg.wms.repository.service.IQmsQualityInspectorService; import com.nflg.wms.starter.BaseController; @@ -18,6 +20,8 @@ import jakarta.validation.constraints.NotNull; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 质检人员管理 */ @@ -109,4 +113,14 @@ public class QmsQualityInspectorController extends BaseController { qualityInspectorService.cancelTransfer(userId); return ApiResult.success(); } + + /** + * 按当前登录用户查询绑定的物料列表（支持物料编号/类别/描述过滤） + * + * @param qo 查询参数（materialNo/materialCategoryCode/materialDesc可选） + */ + @PostMapping("materialsByUser") + public ApiResult> materialsByUser(@RequestBody QmsMaterialsByUserQO qo) { + return ApiResult.success(qualityInspectorService.getMaterialsByUserId(qo.getMaterialNo(), qo.getMaterialCategoryCode(), qo.getMaterialDesc())); + } } 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 0dce7c01..fd12709b 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 @@ -7,7 +7,9 @@ import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.QmsSupplierSqeSearchQO; import com.nflg.wms.common.pojo.qo.QmsSetSupplierQO; import com.nflg.wms.common.pojo.qo.QmsSetUserQO; +import com.nflg.wms.common.pojo.qo.QmsUserMaterialsQO; import com.nflg.wms.common.pojo.vo.QmsSupplierSqeMapVO; +import com.nflg.wms.common.pojo.vo.QmsUserSupplierVO; import com.nflg.wms.repository.service.IQmsSupplierSqeMapService; import com.nflg.wms.starter.BaseController; import jakarta.annotation.Resource; @@ -16,6 +18,8 @@ import jakarta.validation.constraints.NotNull; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 供应商-用户 关联管理 */ @@ -75,4 +79,14 @@ public class QmsSupplierSqeController extends BaseController { supplierSqeMapService.deleteById(id); return ApiResult.success(); } + + /** + * 按当前登录用户查询关联的供应商列表（支持供应商过滤） + * + * @param qo 查询参数（supplierCode/supplierName可选） + */ + @PostMapping("supplierByUser") + public ApiResult> supplierByUser(@RequestBody QmsUserMaterialsQO qo) { + return ApiResult.success(supplierSqeMapService.getSuppliersByUserId(qo.getSupplierCode(), qo.getSupplierName())); + } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionItemAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionItemAddQO.java index dbc2fa8d..a598466d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionItemAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionItemAddQO.java @@ -1,11 +1,15 @@ package com.nflg.wms.common.pojo.qo; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; +import java.util.List; + /** - * 新增检测项参数（同时创建主表和一条明细） + * 新增检测项参数（主表 + 多条明细） */ @Data public class QmsInspectionItemAddQO { @@ -35,19 +39,32 @@ public class QmsInspectionItemAddQO { private String inspectionNo; /** - * 检测标准（必传） + * 明细列表（必传，至少一条） */ - @NotBlank(message = "检测标准不能为空") - private String testStandard; + @NotEmpty(message = "明细列表不能为空") + @Valid + private List details; /** - * 图例（可选） + * 明细参数 */ - private String legend; + @Data + public static class DetailQO { + /** + * 检测标准（必传） + */ + @NotBlank(message = "检测标准不能为空") + private String testStandard; - /** - * 判定类型：0=目视，1=量具（必传） - */ - @NotNull(message = "判定类型不能为空") - private Integer determinationType; + /** + * 图例（可选） + */ + private String legend; + + /** + * 判定类型：0=目视，1=量具（必传） + */ + @NotNull(message = "判定类型不能为空") + private Integer determinationType; + } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionItemUpdateQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionItemUpdateQO.java index c2cf454f..d29c6310 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionItemUpdateQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionItemUpdateQO.java @@ -1,10 +1,14 @@ package com.nflg.wms.common.pojo.qo; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; +import java.util.List; + /** - * 修改检测项参数 + * 修改检测项参数（主表 + 明细列表全量替换） */ @Data public class QmsInspectionItemUpdateQO { @@ -36,22 +40,29 @@ public class QmsInspectionItemUpdateQO { private String inspectionNo; /** - * 检测标准（可选，修改对应的明细） + * 明细列表（可选，传入则全量替换原有明细） */ - private String testStandard; + @Valid + private List details; /** - * 图例（可选） + * 明细参数 */ - private String legend; + @Data + public static class DetailQO { + /** + * 检测标准（必传） + */ + private String testStandard; - /** - * 判定类型：0=目视，1=量具（可选） - */ - private Integer determinationType; + /** + * 图例（可选） + */ + private String legend; - /** - * 明细表ID（可选，若传入则更新指定明细，否则更新第一条明细） - */ - private Long detailId; + /** + * 判定类型：0=目视，1=量具（必传） + */ + private Integer determinationType; + } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsMaterialsByUserQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsMaterialsByUserQO.java new file mode 100644 index 00000000..b640d4f8 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsMaterialsByUserQO.java @@ -0,0 +1,25 @@ +package com.nflg.wms.common.pojo.qo; + +import lombok.Data; + +/** + * 按用户查询绑定物料参数 + */ +@Data +public class QmsMaterialsByUserQO { + + /** + * 物料编号（精确，可选） + */ + private String materialNo; + + /** + * 物料类别编码（精确，可选） + */ + private String materialCategoryCode; + + /** + * 物料描述（模糊，可选） + */ + private String materialDesc; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsUserMaterialsQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsUserMaterialsQO.java new file mode 100644 index 00000000..1506dc99 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsUserMaterialsQO.java @@ -0,0 +1,20 @@ +package com.nflg.wms.common.pojo.qo; + +import lombok.Data; + +/** + * 按用户查询供应商列表参数 + */ +@Data +public class QmsUserMaterialsQO { + + /** + * 供应商编号（精确，可选） + */ + private String supplierCode; + + /** + * 供应商名称（模糊，可选） + */ + private String supplierName; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsUserSupplierVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsUserSupplierVO.java new file mode 100644 index 00000000..63ccfa33 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsUserSupplierVO.java @@ -0,0 +1,35 @@ +package com.nflg.wms.common.pojo.vo; + +import lombok.Data; + +/** + * 用户关联的供应商信息 + */ +@Data +public class QmsUserSupplierVO { + + /** + * 关联记录ID（qms_supplier_sqe_map.id） + */ + private Long id; + + /** + * 供应商ID + */ + private Long supplierId; + + /** + * 供应商编号 + */ + private String supplierCode; + + /** + * 供应商名称 + */ + private String supplierName; + + /** + * 启用状态：true=启用，false=禁用 + */ + private Boolean enable; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsQualityInspectorMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsQualityInspectorMapper.java index d5b7ed14..81839fb3 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsQualityInspectorMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsQualityInspectorMapper.java @@ -32,6 +32,23 @@ public interface QmsQualityInspectorMapper extends BaseMapper getMaterialsByUserId(@Param("userId") Long userId); + /** + * 按 userId 查询关联物料列表（支持供应商过滤） + */ + List getMaterialsByUserIdWithSupplier( + @Param("userId") Long userId, + @Param("supplierCode") String supplierCode, + @Param("supplierName") String supplierName); + + /** + * 按 userId 查询绑定物料列表（支持物料编号/类别/描述过滤） + */ + List getMaterialsByUserIdWithFilter( + @Param("userId") Long userId, + @Param("materialNo") String materialNo, + @Param("materialCategoryCode") String materialCategoryCode, + @Param("materialDesc") String materialDesc); + /** * 按 userId 查询关联物料类别列表 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsSupplierSqeMapMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsSupplierSqeMapMapper.java index 5ba43dab..468b4c20 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsSupplierSqeMapMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsSupplierSqeMapMapper.java @@ -4,10 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.pojo.qo.QmsSupplierSqeSearchQO; +import com.nflg.wms.common.pojo.qo.QmsUserMaterialsQO; import com.nflg.wms.common.pojo.vo.QmsSupplierSqeMapVO; +import com.nflg.wms.common.pojo.vo.QmsUserSupplierVO; import com.nflg.wms.repository.entity.QmsSupplierSqeMap; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 供应商-用户关联 Mapper 接口 @@ -22,4 +26,12 @@ public interface QmsSupplierSqeMapMapper extends BaseMapper { * 分页查询关联表（JOIN 供应商/user/user_interior/position，支持动态过滤） */ IPage searchMap(@Param("request") QmsSupplierSqeSearchQO request, Page page); + + /** + * 按 userId 查询关联的供应商列表（支持供应商过滤） + */ + List getSuppliersByUserId( + @Param("userId") Long userId, + @Param("supplierCode") String supplierCode, + @Param("supplierName") String supplierName); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionItemService.java index 421e0fe2..77e9fb85 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionItemService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionItemService.java @@ -5,7 +5,6 @@ import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.dto.QmsInspectionItemExportDTO; import com.nflg.wms.common.pojo.dto.QmsInspectionItemImportDTO; import com.nflg.wms.common.pojo.qo.QmsInspectionItemAddQO; -import com.nflg.wms.common.pojo.qo.QmsInspectionItemDetailAddQO; import com.nflg.wms.common.pojo.qo.QmsInspectionItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsInspectionItemUpdateQO; import com.nflg.wms.common.pojo.vo.QmsInspectionItemDetailsVO; @@ -20,7 +19,7 @@ import java.util.List; public interface IQmsInspectionItemService extends IService { /** - * 新增（同时插入主表和一条明细） + * 新增（主表 + 多条明细） */ void add(QmsInspectionItemAddQO qo); @@ -30,20 +29,10 @@ public interface IQmsInspectionItemService extends IService { void delete(List ids); /** - * 修改（主表字段动态更新，明细字段同时更新第一条明细） + * 修改（主表 + 明细列表全量替换） */ void update(QmsInspectionItemUpdateQO qo); - /** - * 明细新增 - */ - void addDetail(QmsInspectionItemDetailAddQO qo); - - /** - * 明细删除（批量） - */ - void deleteDetails(List detailIds); - /** * 分页查询检测项 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsQualityInspectorService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsQualityInspectorService.java index 7d94b704..ce660d53 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsQualityInspectorService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsQualityInspectorService.java @@ -2,14 +2,18 @@ package com.nflg.wms.repository.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.nflg.wms.common.pojo.qo.QmsMaterialsByUserQO; import com.nflg.wms.common.pojo.qo.QmsQualityInspectorAddQO; import com.nflg.wms.common.pojo.qo.QmsQualityInspectorSearchQO; import com.nflg.wms.common.pojo.qo.QmsQualityInspectorTransferQO; import com.nflg.wms.common.pojo.qo.QmsQualityInspectorUpdateQO; import com.nflg.wms.common.pojo.vo.QmsQualityInspectorDetailVO; +import com.nflg.wms.common.pojo.vo.QmsQualityInspectorMaterialVO; import com.nflg.wms.common.pojo.vo.QmsQualityInspectorVO; import com.nflg.wms.repository.entity.QmsQualityInspector; +import java.util.List; + /** *

* 质检人员物料关系 服务类 @@ -59,4 +63,9 @@ public interface IQmsQualityInspectorService extends IService getMaterialsByUserId(String materialNo, String materialCategoryCode, String materialDesc); } 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 549b3cec..3dfe823a 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 @@ -3,7 +3,9 @@ package com.nflg.wms.repository.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.common.pojo.qo.QmsSupplierSqeSearchQO; +import com.nflg.wms.common.pojo.qo.QmsUserMaterialsQO; import com.nflg.wms.common.pojo.vo.QmsSupplierSqeMapVO; +import com.nflg.wms.common.pojo.vo.QmsUserSupplierVO; import com.nflg.wms.repository.entity.QmsSupplierSqeMap; import java.util.List; @@ -42,4 +44,9 @@ public interface IQmsSupplierSqeMapService extends IService { * 删除单条供应商-用户关联（启用状态下不允许删除） */ void deleteById(Long id); + + /** + * 按 userId 查询该用户关联的供应商列表（支持供应商过滤） + */ + List getSuppliersByUserId(String supplierCode, String supplierName); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java index 07a50311..fba7e810 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java @@ -56,6 +56,7 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl detailIds) { - if (detailIds == null || detailIds.isEmpty()) { - throw new NflgException(STATE.BusinessError, "明细ID列表不能为空"); - } - detailsService.removeByIds(detailIds); - } - // ==================== 分页查询 ==================== @Override diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java index db0ba74d..587ac309 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.exception.NflgException; +import com.nflg.wms.common.pojo.qo.QmsMaterialsByUserQO; import com.nflg.wms.common.pojo.qo.QmsQualityInspectorAddQO; import com.nflg.wms.common.pojo.qo.QmsQualityInspectorSearchQO; import com.nflg.wms.common.pojo.qo.QmsQualityInspectorTransferQO; @@ -304,4 +305,10 @@ public class QmsQualityInspectorServiceImpl extends ServiceImpl getMaterialsByUserId(String materialNo, String materialCategoryCode, String materialDesc) { + Long userId = UserUtil.getUserId(); + return baseMapper.getMaterialsByUserIdWithFilter(userId, materialNo, materialCategoryCode, materialDesc); + } } 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 579854bb..d3de62bf 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 @@ -7,6 +7,7 @@ import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.pojo.qo.QmsSupplierSqeSearchQO; import com.nflg.wms.common.pojo.vo.QmsSupplierSqeMapVO; +import com.nflg.wms.common.pojo.vo.QmsUserSupplierVO; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.repository.entity.QmsSupplierSqeMap; import com.nflg.wms.repository.mapper.QmsSupplierSqeMapMapper; @@ -122,4 +123,10 @@ public class QmsSupplierSqeMapServiceImpl extends ServiceImpl getSuppliersByUserId(String supplierCode, String supplierName) { + Long userId = UserUtil.getUserId(); + return baseMapper.getSuppliersByUserId(userId, supplierCode, supplierName); + } } diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml index 12f39353..4c6750f7 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml @@ -74,6 +74,64 @@ ORDER BY qi.id ASC + + + + + + + + +