From 8f07dbca401804c6156c5e1e74e5136b14d86b58 Mon Sep 17 00:00:00 2001 From: funny <834502597@qq.com> Date: Fri, 17 Apr 2026 10:14:23 +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=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20=E6=9C=80=E6=99=9A=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QmsQualityInspectorController.java | 8 ++++---- .../admin/controller/QmsSupplierSqeController.java | 8 ++++---- .../com/nflg/wms/common/pojo/qo/QmsCoaTaskAddQO.java | 3 +-- .../wms/common/pojo/qo/QmsMaterialsByUserQO.java | 10 ++++++++++ .../nflg/wms/common/pojo/qo/QmsUserMaterialsQO.java | 10 ++++++++++ .../pojo/vo/QmsQualityInspectorMaterialVO.java | 5 +++++ .../repository/mapper/QmsQualityInspectorMapper.java | 5 +++-- .../repository/mapper/QmsSupplierSqeMapMapper.java | 5 +++-- .../service/IQmsQualityInspectorService.java | 5 +++-- .../service/IQmsSupplierSqeMapService.java | 5 +++-- .../service/impl/QmsQualityInspectorServiceImpl.java | 12 ++++++++++-- .../service/impl/QmsSupplierSqeMapServiceImpl.java | 12 ++++++++++-- .../resources/mapper/QmsQualityInspectorMapper.xml | 1 + 13 files changed, 67 insertions(+), 22 deletions(-) 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 38a1200d..a7b51e1b 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 @@ -115,12 +115,12 @@ public class QmsQualityInspectorController extends BaseController { } /** - * 按当前登录用户查询绑定的物料列表（支持物料编号/类别/描述过滤） + * 按当前登录用户查询绑定的物料列表（支持物料编号/类别/描述过滤，分页） * - * @param qo 查询参数（materialNo/materialCategoryCode/materialDesc可选） + * @param qo 查询参数（materialNo/materialCategoryCode/materialDesc/pageNum/pageSize） */ @PostMapping("materialsByUser") - public ApiResult> materialsByUser(@RequestBody QmsMaterialsByUserQO qo) { - return ApiResult.success(qualityInspectorService.getMaterialsByUserId(qo.getMaterialNo(), qo.getMaterialCategoryCode(), qo.getMaterialDesc())); + public ApiResult> materialsByUser(@RequestBody QmsMaterialsByUserQO qo) { + return ApiResult.success(qualityInspectorService.getMaterialsByUserId(qo.getMaterialNo(), qo.getMaterialCategoryCode(), qo.getMaterialDesc(), qo.getPageNum(), qo.getPageSize())); } } 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 fd12709b..06fe35ab 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 @@ -81,12 +81,12 @@ public class QmsSupplierSqeController extends BaseController { } /** - * 按当前登录用户查询关联的供应商列表（支持供应商过滤） + * 按当前登录用户查询关联的供应商列表（支持供应商过滤，分页） * - * @param qo 查询参数（supplierCode/supplierName可选） + * @param qo 查询参数（supplierCode/supplierName/pageNum/pageSize） */ @PostMapping("supplierByUser") - public ApiResult> supplierByUser(@RequestBody QmsUserMaterialsQO qo) { - return ApiResult.success(supplierSqeMapService.getSuppliersByUserId(qo.getSupplierCode(), qo.getSupplierName())); + public ApiResult> supplierByUser(@RequestBody QmsUserMaterialsQO qo) { + return ApiResult.success(supplierSqeMapService.getSuppliersByUserId(qo.getSupplierCode(), qo.getSupplierName(), qo.getPageNum(), qo.getPageSize())); } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaTaskAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaTaskAddQO.java index 6db88f42..b046158d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaTaskAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaTaskAddQO.java @@ -31,9 +31,8 @@ public class QmsCoaTaskAddQO { private String requirement; /** - * 最晚提交时间（必传） + * 最晚提交时间 */ - @NotNull(message = "最晚提交时间不能为空") private LocalDate lastSubTime; /** 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 index b640d4f8..b6184005 100644 --- 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 @@ -22,4 +22,14 @@ public class QmsMaterialsByUserQO { * 物料描述（模糊，可选） */ private String materialDesc; + + /** + * 页码 + */ + private Integer pageNum = 1; + + /** + * 每页大小 + */ + private Integer pageSize = 10; } 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 index 1506dc99..6937f5e2 100644 --- 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 @@ -17,4 +17,14 @@ public class QmsUserMaterialsQO { * 供应商名称（模糊，可选） */ private String supplierName; + + /** + * 页码 + */ + private Integer pageNum = 1; + + /** + * 每页大小 + */ + private Integer pageSize = 10; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorMaterialVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorMaterialVO.java index cde3b349..accb1c01 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorMaterialVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorMaterialVO.java @@ -23,6 +23,11 @@ public class QmsQualityInspectorMaterialVO { */ private String materialNo; + /** + * 物料图号 + */ + private String drawingNo; + /** * 物料类别编码 */ 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 81839fb3..d1176e23 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 @@ -41,9 +41,10 @@ public interface QmsQualityInspectorMapper extends BaseMapper getMaterialsByUserIdWithFilter( + IPage getMaterialsByUserIdWithFilter( + Page page, @Param("userId") Long userId, @Param("materialNo") String materialNo, @Param("materialCategoryCode") String materialCategoryCode, 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 468b4c20..1c1a1e50 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 @@ -28,9 +28,10 @@ public interface QmsSupplierSqeMapMapper extends BaseMapper { IPage searchMap(@Param("request") QmsSupplierSqeSearchQO request, Page page); /** - * 按 userId 查询关联的供应商列表（支持供应商过滤） + * 按 userId 查询关联的供应商列表（支持供应商过滤，分页） */ - List getSuppliersByUserId( + IPage getSuppliersByUserId( + Page page, @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/IQmsQualityInspectorService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsQualityInspectorService.java index ce660d53..b255ffae 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,6 +2,7 @@ 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.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; @@ -65,7 +66,7 @@ public interface IQmsQualityInspectorService extends IService getMaterialsByUserId(String materialNo, String materialCategoryCode, String materialDesc); + PageData getMaterialsByUserId(String materialNo, String materialCategoryCode, String materialDesc, Integer pageNum, Integer pageSize); } 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 3dfe823a..b793403b 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 @@ -2,6 +2,7 @@ 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.PageData; import com.nflg.wms.common.pojo.qo.QmsSupplierSqeSearchQO; import com.nflg.wms.common.pojo.qo.QmsUserMaterialsQO; import com.nflg.wms.common.pojo.vo.QmsSupplierSqeMapVO; @@ -46,7 +47,7 @@ public interface IQmsSupplierSqeMapService extends IService { void deleteById(Long id); /** - * 按 userId 查询该用户关联的供应商列表（支持供应商过滤） + * 按 userId 查询该用户关联的供应商列表（支持供应商过滤，分页） */ - List getSuppliersByUserId(String supplierCode, String supplierName); + PageData getSuppliersByUserId(String supplierCode, String supplierName, Integer pageNum, Integer pageSize); } 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 587ac309..b89092b7 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.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; @@ -307,8 +308,15 @@ public class QmsQualityInspectorServiceImpl extends ServiceImpl getMaterialsByUserId(String materialNo, String materialCategoryCode, String materialDesc) { + public PageData getMaterialsByUserId(String materialNo, String materialCategoryCode, String materialDesc, Integer pageNum, Integer pageSize) { Long userId = UserUtil.getUserId(); - return baseMapper.getMaterialsByUserIdWithFilter(userId, materialNo, materialCategoryCode, materialDesc); + Page page = new Page<>(pageNum, pageSize); + IPage result = baseMapper.getMaterialsByUserIdWithFilter(page, userId, materialNo, materialCategoryCode, materialDesc); + + return new PageData() + .setPage((int) result.getCurrent()) + .setPageSize((int) result.getSize()) + .setTotal((int) result.getTotal()) + .setItems(result.getRecords()); } } 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 d3de62bf..373eedc2 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 @@ -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.PageData; import com.nflg.wms.common.pojo.qo.QmsSupplierSqeSearchQO; import com.nflg.wms.common.pojo.vo.QmsSupplierSqeMapVO; import com.nflg.wms.common.pojo.vo.QmsUserSupplierVO; @@ -125,8 +126,15 @@ public class QmsSupplierSqeMapServiceImpl extends ServiceImpl getSuppliersByUserId(String supplierCode, String supplierName) { + public PageData getSuppliersByUserId(String supplierCode, String supplierName, Integer pageNum, Integer pageSize) { Long userId = UserUtil.getUserId(); - return baseMapper.getSuppliersByUserId(userId, supplierCode, supplierName); + Page page = new Page<>(pageNum, pageSize); + IPage result = baseMapper.getSuppliersByUserId(page, userId, supplierCode, supplierName); + + return new PageData() + .setPage((int) result.getCurrent()) + .setPageSize((int) result.getSize()) + .setTotal((int) result.getTotal()) + .setItems(result.getRecords()); } } diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml index 4c6750f7..91154bec 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml @@ -110,6 +110,7 @@ qi.id, qi.material_id, m.material_no, + m.drawing_no, m.material_category_code, m.material_category_code_path_name AS material_category_name, m.material_desc AS material_name,