DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(qc): 新增待检项模板功能及相关接口

Browse Source 
- 新增待检项模板实体类、VO、BO及Mapper接口
- 实现待检项模板的增删改查及分页查询功能
- 新增根据待检项ID批量查询检查项信息服务接口
- 实现检查项Mapper中根据ID列表查询的方法
- 添加对应XML SQL语句支持批量查询检查项
- 控制器中增加导出及通过待检项查询详情接口
- 完善相关服务层逻辑处理及参数校验
This commit is contained in:
Joshi
2025-12-05 17:03:57 +08:00
parent 68a0b9c68d
commit 1b205f04cc
12 changed files with 548 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
klp-mes/src/main/java/com/klp/mes/qc/controller/WmsInspectionItemTemplateController.java Normal file
View File

@@ -0,0 +1,109 @@
package com.klp.mes.qc.controller;
import java.util.List;
import java.util.Arrays;
import com.klp.mes.qc.domain.vo.WmsCheckItemVo;
import liquibase.pro.packaged.W;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.mes.qc.domain.vo.WmsInspectionItemTemplateVo;
import com.klp.mes.qc.domain.bo.WmsInspectionItemTemplateBo;
import com.klp.mes.qc.service.IWmsInspectionItemTemplateService;
import com.klp.common.core.page.TableDataInfo;
/**
* 待检项模板
*
* @author klp
* @date 2025-12-05
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/qc/inspectionItemTemplate")
public class WmsInspectionItemTemplateController extends BaseController {
private final IWmsInspectionItemTemplateService iWmsInspectionItemTemplateService;
/**
* 查询待检项模板列表
*/
@GetMapping("/list")
public TableDataInfo<WmsInspectionItemTemplateVo> list(WmsInspectionItemTemplateBo bo, PageQuery pageQuery) {
return iWmsInspectionItemTemplateService.queryPageList(bo, pageQuery);
}
/**
* 导出待检项模板列表
*/
@Log(title = "待检项模板", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsInspectionItemTemplateBo bo, HttpServletResponse response) {
List<WmsInspectionItemTemplateVo> list = iWmsInspectionItemTemplateService.queryList(bo);
ExcelUtil.exportExcel(list, "待检项模板", WmsInspectionItemTemplateVo.class, response);
}
/**
* 获取待检项模板详细信息
*
* @param templateId 主键
*/
@GetMapping("/{templateId}")
public R<WmsInspectionItemTemplateVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long templateId) {
return R.ok(iWmsInspectionItemTemplateService.queryById(templateId));
}
/**
* 新增待检项模板
*/
@Log(title = "待检项模板", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsInspectionItemTemplateBo bo) {
return toAjax(iWmsInspectionItemTemplateService.insertByBo(bo));
}
/**
* 修改待检项模板
*/
@Log(title = "待检项模板", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsInspectionItemTemplateBo bo) {
return toAjax(iWmsInspectionItemTemplateService.updateByBo(bo));
}
/**
* 删除待检项模板
*
* @param templateIds 主键串
*/
@Log(title = "待检项模板", businessType = BusinessType.DELETE)
@DeleteMapping("/{templateIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] templateIds) {
return toAjax(iWmsInspectionItemTemplateService.deleteWithValidByIds(Arrays.asList(templateIds), true));
}
// 根据待检项查询详细信息
@PostMapping("/getInfoByInspectionItem")
public R<List<WmsCheckItemVo>> getInfoByInspectionItem(@RequestParam String inspectionItemIds) {
return R.ok(iWmsInspectionItemTemplateService.getInfoByInspectionItem(inspectionItemIds));
}
}

49
klp-mes/src/main/java/com/klp/mes/qc/domain/WmsInspectionItemTemplate.java Normal file
View File

@@ -0,0 +1,49 @@
package com.klp.mes.qc.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 待检项模板对象 wms_inspection_item_template
*
* @author klp
* @date 2025-12-05
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("wms_inspection_item_template")
public class WmsInspectionItemTemplate extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键ID
*/
@TableId(value = "template_id")
private Long templateId;
/**
* 模板名称
*/
private String templateName;
/**
* 模板描述
*/
private String templateDesc;
/**
* 待检项（可存储单个待检项或待检项编码，多个可拆分或用JSON）
*/
private String inspectionItem;
/**
* 逻辑删除标识：0=正常，1=已删
*/
@TableLogic
private Integer delFlag;
/**
* 备注
*/
private String remark;
}

46
klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsInspectionItemTemplateBo.java Normal file
View File

@@ -0,0 +1,46 @@
package com.klp.mes.qc.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
/**
* 待检项模板业务对象 wms_inspection_item_template
*
* @author klp
* @date 2025-12-05
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class WmsInspectionItemTemplateBo extends BaseEntity {
/**
* 主键ID
*/
private Long templateId;
/**
* 模板名称
*/
private String templateName;
/**
* 模板描述
*/
private String templateDesc;
/**
* 待检项（可存储单个待检项或待检项编码，多个可拆分或用JSON）
*/
private String inspectionItem;
/**
* 备注
*/
private String remark;
}

61
klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsInspectionItemTemplateVo.java Normal file
View File

@@ -0,0 +1,61 @@
package com.klp.mes.qc.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import lombok.Data;
import java.util.List;
/**
* 待检项模板视图对象 wms_inspection_item_template
*
* @author klp
* @date 2025-12-05
*/
@Data
@ExcelIgnoreUnannotated
public class WmsInspectionItemTemplateVo {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long templateId;
/**
* 模板名称
*/
@ExcelProperty(value = "模板名称")
private String templateName;
/**
* 模板描述
*/
@ExcelProperty(value = "模板描述")
private String templateDesc;
/**
* 待检项（可存储单个待检项或待检项编码，多个可拆分或用JSON）
*/
@ExcelProperty(value = "待检项", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "可=存储单个待检项或待检项编码，多个可拆分或用JSON")
private String inspectionItem;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
private List<WmsCheckItemVo> checkItemList;
}

4
klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckItemMapper.java
View File

@@ -3,6 +3,9 @@ package com.klp.mes.qc.mapper;
import com.klp.mes.qc.domain.WmsCheckItem;
import com.klp.mes.qc.domain.vo.WmsCheckItemVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 检查项Mapper接口
@@ -12,4 +15,5 @@ import com.klp.common.core.mapper.BaseMapperPlus;
*/
public interface WmsCheckItemMapper extends BaseMapperPlus<WmsCheckItemMapper, WmsCheckItem, WmsCheckItemVo> {
List<WmsCheckItemVo> selectVoListByIds(@Param("ids") List<Long> ids);
}

15
klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsInspectionItemTemplateMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.klp.mes.qc.mapper;
import com.klp.mes.qc.domain.WmsInspectionItemTemplate;
import com.klp.mes.qc.domain.vo.WmsInspectionItemTemplateVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 待检项模板Mapper接口
*
* @author klp
* @date 2025-12-05
*/
public interface WmsInspectionItemTemplateMapper extends BaseMapperPlus<WmsInspectionItemTemplateMapper, WmsInspectionItemTemplate, WmsInspectionItemTemplateVo> {
}

2
klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java
View File

@@ -46,4 +46,6 @@ public interface IWmsCheckItemService {
* 校验并批量删除检查项信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
List<WmsCheckItemVo> getInfoByInspectionItems(List<Long> ids);
}

52
klp-mes/src/main/java/com/klp/mes/qc/service/IWmsInspectionItemTemplateService.java Normal file
View File

@@ -0,0 +1,52 @@
package com.klp.mes.qc.service;
import com.klp.mes.qc.domain.WmsInspectionItemTemplate;
import com.klp.mes.qc.domain.vo.WmsCheckItemVo;
import com.klp.mes.qc.domain.vo.WmsInspectionItemTemplateVo;
import com.klp.mes.qc.domain.bo.WmsInspectionItemTemplateBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 待检项模板Service接口
*
* @author klp
* @date 2025-12-05
*/
public interface IWmsInspectionItemTemplateService {
/**
* 查询待检项模板
*/
WmsInspectionItemTemplateVo queryById(Long templateId);
/**
* 查询待检项模板列表
*/
TableDataInfo<WmsInspectionItemTemplateVo> queryPageList(WmsInspectionItemTemplateBo bo, PageQuery pageQuery);
/**
* 查询待检项模板列表
*/
List<WmsInspectionItemTemplateVo> queryList(WmsInspectionItemTemplateBo bo);
/**
* 新增待检项模板
*/
Boolean insertByBo(WmsInspectionItemTemplateBo bo);
/**
* 修改待检项模板
*/
Boolean updateByBo(WmsInspectionItemTemplateBo bo);
/**
* 校验并批量删除待检项模板信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
List<WmsCheckItemVo> getInfoByInspectionItem(String inspectionItemIds);
}

8
klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java
View File

@@ -15,6 +15,7 @@ import com.klp.mes.qc.domain.WmsCheckItem;
import com.klp.mes.qc.mapper.WmsCheckItemMapper;
import com.klp.mes.qc.service.IWmsCheckItemService;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Collection;
@@ -112,4 +113,11 @@ public class WmsCheckItemServiceImpl implements IWmsCheckItemService {
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public List<WmsCheckItemVo> getInfoByInspectionItems(List<Long> ids) {
//根据id批量查询
List<WmsCheckItemVo> list = baseMapper.selectVoListByIds(ids);
return list != null ? list : Collections.emptyList();
}
}

161
klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsInspectionItemTemplateServiceImpl.java Normal file
View File

@@ -0,0 +1,161 @@
package com.klp.mes.qc.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.esotericsoftware.minlog.Log;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.klp.mes.qc.controller.WmsCheckItemController;
import com.klp.mes.qc.domain.vo.WmsCheckItemVo;
import com.klp.mes.qc.service.IWmsCheckItemService;
import liquibase.pro.packaged.W;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.mes.qc.domain.bo.WmsInspectionItemTemplateBo;
import com.klp.mes.qc.domain.vo.WmsInspectionItemTemplateVo;
import com.klp.mes.qc.domain.WmsInspectionItemTemplate;
import com.klp.mes.qc.mapper.WmsInspectionItemTemplateMapper;
import com.klp.mes.qc.service.IWmsInspectionItemTemplateService;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 待检项模板Service业务层处理
*
* @author klp
* @date 2025-12-05
*/
@RequiredArgsConstructor
@Service
public class WmsInspectionItemTemplateServiceImpl implements IWmsInspectionItemTemplateService {
private final WmsInspectionItemTemplateMapper baseMapper;
private final IWmsCheckItemService wmsCheckItemService;
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(WmsInspectionItemTemplateServiceImpl.class);
/**
* 查询待检项模板
*/
@Override
public WmsInspectionItemTemplateVo queryById(Long templateId){
return baseMapper.selectVoById(templateId);
}
/**
* 查询待检项模板列表
*/
@Override
public TableDataInfo<WmsInspectionItemTemplateVo> queryPageList(WmsInspectionItemTemplateBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsInspectionItemTemplate> lqw = buildQueryWrapper(bo);
Page<WmsInspectionItemTemplateVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询待检项模板列表
*/
@Override
public List<WmsInspectionItemTemplateVo> queryList(WmsInspectionItemTemplateBo bo) {
LambdaQueryWrapper<WmsInspectionItemTemplate> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<WmsInspectionItemTemplate> buildQueryWrapper(WmsInspectionItemTemplateBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsInspectionItemTemplate> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getTemplateName()), WmsInspectionItemTemplate::getTemplateName, bo.getTemplateName());
lqw.eq(StringUtils.isNotBlank(bo.getTemplateDesc()), WmsInspectionItemTemplate::getTemplateDesc, bo.getTemplateDesc());
lqw.eq(StringUtils.isNotBlank(bo.getInspectionItem()), WmsInspectionItemTemplate::getInspectionItem, bo.getInspectionItem());
return lqw;
}
/**
* 新增待检项模板
*/
@Override
public Boolean insertByBo(WmsInspectionItemTemplateBo bo) {
WmsInspectionItemTemplate add = BeanUtil.toBean(bo, WmsInspectionItemTemplate.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setTemplateId(add.getTemplateId());
}
return flag;
}
/**
* 修改待检项模板
*/
@Override
public Boolean updateByBo(WmsInspectionItemTemplateBo bo) {
WmsInspectionItemTemplate update = BeanUtil.toBean(bo, WmsInspectionItemTemplate.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(WmsInspectionItemTemplate entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除待检项模板
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public List<WmsCheckItemVo> getInfoByInspectionItem(String inspectionItemIds) {
// 1. 获取待检项ID字符串并进行基本校验
if (inspectionItemIds == null || inspectionItemIds.trim().isEmpty()) {
log.warn("待检项ID不能为空");
return null;
}
// 2. 拆分ID并转换为Long类型
String[] inspectionItemIdArray = inspectionItemIds.split(",");
List<Long> ids = new ArrayList<>();
for (String id : inspectionItemIdArray) {
if (StringUtils.isNotBlank(id)) {
try {
ids.add(Long.valueOf(id));
} catch (NumberFormatException e) {
log.warn("无效的待检项ID: {}", id);
}
}
}
// 3. 如果没有有效的ID，直接返回null
if (ids.isEmpty()) {
return null;
}
// 4. 批量查询所有待检项信息（避免多次查询）
List<WmsCheckItemVo> result = wmsCheckItemService.getInfoByInspectionItems(ids);
// 处理待检项信息
if (result != null && !result.isEmpty()) {
return result;
}
// 5. 如果没有找到数据，返回空对象而不是null
return new ArrayList<>();
}
}

20
klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml
View File

@@ -20,6 +20,26 @@
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
</resultMap>
<select id="selectVoListByIds" resultType="com.klp.mes.qc.domain.vo.WmsCheckItemVo">
SELECT item_id,
item_name,
target_upper,
target_lower,
standard_target,
unit,
qualitative_quantitative,
create_by,
create_time,
update_by,
update_time,
del_flag,
remark
FROM wms_check_item
WHERE item_id IN
<foreach item="ids" collection="list" separator="," close=")" open="(" index="">
#{ids}
</foreach>
</select>
</mapper>

21
klp-mes/src/main/resources/mapper/qc/WmsInspectionItemTemplateMapper.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.mes.qc.mapper.WmsInspectionItemTemplateMapper">
<resultMap type="com.klp.mes.qc.domain.WmsInspectionItemTemplate" id="WmsInspectionItemTemplateResult">
<result property="templateId" column="template_id"/>
<result property="templateName" column="template_name"/>
<result property="templateDesc" column="template_desc"/>
<result property="inspectionItem" column="inspection_item"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
</resultMap>
</mapper>