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

新增COA发送通知物料查询和供应商分页查询功能 

最晚提交时间字段更改
This commit is contained in:
funny 2026-04-17 10:14:23 +08:00
parent aea418d78c
commit 8f07dbca40
13 changed files with 67 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsQualityInspectorController.java
View File

@ -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<List<QmsQualityInspectorMaterialVO>> materialsByUser(@RequestBody QmsMaterialsByUserQO qo) {
return ApiResult.success(qualityInspectorService.getMaterialsByUserId(qo.getMaterialNo(), qo.getMaterialCategoryCode(), qo.getMaterialDesc()));
public ApiResult<PageData<QmsQualityInspectorMaterialVO>> materialsByUser(@RequestBody QmsMaterialsByUserQO qo) {
return ApiResult.success(qualityInspectorService.getMaterialsByUserId(qo.getMaterialNo(), qo.getMaterialCategoryCode(), qo.getMaterialDesc(), qo.getPageNum(), qo.getPageSize()));
}
}

8
nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsSupplierSqeController.java
View File

@ -81,12 +81,12 @@ public class QmsSupplierSqeController extends BaseController {
}
/**
* 按当前登录用户查询关联的供应商列表（支持供应商过滤）
* 按当前登录用户查询关联的供应商列表（支持供应商过滤，分页）
*
* @param qo 查询参数（supplierCode/supplierName可选）
* @param qo 查询参数（supplierCode/supplierName/pageNum/pageSize）
*/
@PostMapping("supplierByUser")
public ApiResult<List<QmsUserSupplierVO>> supplierByUser(@RequestBody QmsUserMaterialsQO qo) {
return ApiResult.success(supplierSqeMapService.getSuppliersByUserId(qo.getSupplierCode(), qo.getSupplierName()));
public ApiResult<PageData<QmsUserSupplierVO>> supplierByUser(@RequestBody QmsUserMaterialsQO qo) {
return ApiResult.success(supplierSqeMapService.getSuppliersByUserId(qo.getSupplierCode(), qo.getSupplierName(), qo.getPageNum(), qo.getPageSize()));
}
}

3
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaTaskAddQO.java
View File

@ -31,9 +31,8 @@ public class QmsCoaTaskAddQO {
private String requirement;
/**
* 最晚提交时间（必传）
* 最晚提交时间
*/
@NotNull(message = "最晚提交时间不能为空")
private LocalDate lastSubTime;
/**

10
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsMaterialsByUserQO.java
View File

@ -22,4 +22,14 @@ public class QmsMaterialsByUserQO {
* 物料描述（模糊，可选）
*/
private String materialDesc;
/**
* 页码
*/
private Integer pageNum = 1;
/**
* 每页大小
*/
private Integer pageSize = 10;
}

10
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsUserMaterialsQO.java
View File

@ -17,4 +17,14 @@ public class QmsUserMaterialsQO {
* 供应商名称（模糊，可选）
*/
private String supplierName;
/**
* 页码
*/
private Integer pageNum = 1;
/**
* 每页大小
*/
private Integer pageSize = 10;
}

5
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorMaterialVO.java
View File

@ -23,6 +23,11 @@ public class QmsQualityInspectorMaterialVO {
*/
private String materialNo;
/**
* 物料图号
*/
private String drawingNo;
/**
* 物料类别编码
*/

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsQualityInspectorMapper.java
View File

@ -41,9 +41,10 @@ public interface QmsQualityInspectorMapper extends BaseMapper<QmsQualityInspecto
@Param("supplierName") String supplierName);
/**
* 按 userId 查询绑定物料列表（支持物料编号/类别/描述过滤）
* 按 userId 查询绑定物料列表（支持物料编号/类别/描述过滤，分页）
*/
List<QmsQualityInspectorMaterialVO> getMaterialsByUserIdWithFilter(
IPage<QmsQualityInspectorMaterialVO> getMaterialsByUserIdWithFilter(
Page<QmsQualityInspectorMaterialVO> page,
@Param("userId") Long userId,
@Param("materialNo") String materialNo,
@Param("materialCategoryCode") String materialCategoryCode,

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsSupplierSqeMapMapper.java
View File

@ -28,9 +28,10 @@ public interface QmsSupplierSqeMapMapper extends BaseMapper<QmsSupplierSqeMap> {
IPage<QmsSupplierSqeMapVO> searchMap(@Param("request") QmsSupplierSqeSearchQO request, Page<QmsSupplierSqeMapVO> page);
/**
* 按 userId 查询关联的供应商列表（支持供应商过滤）
* 按 userId 查询关联的供应商列表（支持供应商过滤，分页）
*/
List<QmsUserSupplierVO> getSuppliersByUserId(
IPage<QmsUserSupplierVO> getSuppliersByUserId(
Page<QmsUserSupplierVO> page,
@Param("userId") Long userId,
@Param("supplierCode") String supplierCode,
@Param("supplierName") String supplierName);

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsQualityInspectorService.java
View File

@ -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<QmsQualityInspecto
void cancelTransfer(Long userId);
/**
* 按 userId 查询当前用户绑定的物料列表（支持物料编号/类别/描述过滤）
* 按 userId 查询当前用户绑定的物料列表（支持物料编号/类别/描述过滤，分页）
*/
List<QmsQualityInspectorMaterialVO> getMaterialsByUserId(String materialNo, String materialCategoryCode, String materialDesc);
PageData<QmsQualityInspectorMaterialVO> getMaterialsByUserId(String materialNo, String materialCategoryCode, String materialDesc, Integer pageNum, Integer pageSize);
}

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsSupplierSqeMapService.java
View File

@ -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<QmsSupplierSqeMap> {
void deleteById(Long id);
/**
* 按 userId 查询该用户关联的供应商列表（支持供应商过滤）
* 按 userId 查询该用户关联的供应商列表（支持供应商过滤，分页）
*/
List<QmsUserSupplierVO> getSuppliersByUserId(String supplierCode, String supplierName);
PageData<QmsUserSupplierVO> getSuppliersByUserId(String supplierCode, String supplierName, Integer pageNum, Integer pageSize);
}

12
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java
View File

@ -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<QmsQualityInspec
}
@Override
public List<QmsQualityInspectorMaterialVO> getMaterialsByUserId(String materialNo, String materialCategoryCode, String materialDesc) {
public PageData<QmsQualityInspectorMaterialVO> getMaterialsByUserId(String materialNo, String materialCategoryCode, String materialDesc, Integer pageNum, Integer pageSize) {
Long userId = UserUtil.getUserId();
return baseMapper.getMaterialsByUserIdWithFilter(userId, materialNo, materialCategoryCode, materialDesc);
Page<QmsQualityInspectorMaterialVO> page = new Page<>(pageNum, pageSize);
IPage<QmsQualityInspectorMaterialVO> result = baseMapper.getMaterialsByUserIdWithFilter(page, userId, materialNo, materialCategoryCode, materialDesc);
return new PageData<QmsQualityInspectorMaterialVO>()
.setPage((int) result.getCurrent())
.setPageSize((int) result.getSize())
.setTotal((int) result.getTotal())
.setItems(result.getRecords());
}
}

12
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsSupplierSqeMapServiceImpl.java
View File

@ -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<QmsSupplierSqeMapM
}
@Override
public List<QmsUserSupplierVO> getSuppliersByUserId(String supplierCode, String supplierName) {
public PageData<QmsUserSupplierVO> getSuppliersByUserId(String supplierCode, String supplierName, Integer pageNum, Integer pageSize) {
Long userId = UserUtil.getUserId();
return baseMapper.getSuppliersByUserId(userId, supplierCode, supplierName);
Page<QmsUserSupplierVO> page = new Page<>(pageNum, pageSize);
IPage<QmsUserSupplierVO> result = baseMapper.getSuppliersByUserId(page, userId, supplierCode, supplierName);
return new PageData<QmsUserSupplierVO>()
.setPage((int) result.getCurrent())
.setPageSize((int) result.getSize())
.setTotal((int) result.getTotal())
.setItems(result.getRecords());
}
}

1
nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml
View File

@ -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,