feat(wms): 添加检验管理模块功能
- 新增检验项目明细相关实体类、业务对象、视图对象及服务接口 - 实现检验项目明细的增删改查、分页查询及数据校验功能 - 新增检验主记录相关实体类、业务对象、视图对象及服务接口 - 实现检验主记录的增删改查、分页查询及数据校验功能 - 新增金属材料室温拉伸试验相关实体类、业务对象、视图对象及服务接口 - 实现拉伸试验记录的增删改查、分页查询及数据校验功能 - 配置MyBatis映射文件及Excel导出功能 - 添加相应的控制器及参数验证规则
This commit is contained in:
@@ -0,0 +1,49 @@
|
||||
package com.klp.service;
|
||||
|
||||
import com.klp.domain.WmsInspectionDetail;
|
||||
import com.klp.domain.vo.WmsInspectionDetailVo;
|
||||
import com.klp.domain.bo.WmsInspectionDetailBo;
|
||||
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 2026-06-13
|
||||
*/
|
||||
public interface IWmsInspectionDetailService {
|
||||
|
||||
/**
|
||||
* 查询检验项目明细
|
||||
*/
|
||||
WmsInspectionDetailVo queryById(Long detailId);
|
||||
|
||||
/**
|
||||
* 查询检验项目明细列表
|
||||
*/
|
||||
TableDataInfo<WmsInspectionDetailVo> queryPageList(WmsInspectionDetailBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询检验项目明细列表
|
||||
*/
|
||||
List<WmsInspectionDetailVo> queryList(WmsInspectionDetailBo bo);
|
||||
|
||||
/**
|
||||
* 新增检验项目明细
|
||||
*/
|
||||
Boolean insertByBo(WmsInspectionDetailBo bo);
|
||||
|
||||
/**
|
||||
* 修改检验项目明细
|
||||
*/
|
||||
Boolean updateByBo(WmsInspectionDetailBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除检验项目明细信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.klp.service;
|
||||
|
||||
import com.klp.domain.WmsInspectionMain;
|
||||
import com.klp.domain.vo.WmsInspectionMainVo;
|
||||
import com.klp.domain.bo.WmsInspectionMainBo;
|
||||
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 2026-06-13
|
||||
*/
|
||||
public interface IWmsInspectionMainService {
|
||||
|
||||
/**
|
||||
* 查询检验主
|
||||
*/
|
||||
WmsInspectionMainVo queryById(Long mainId);
|
||||
|
||||
/**
|
||||
* 查询检验主列表
|
||||
*/
|
||||
TableDataInfo<WmsInspectionMainVo> queryPageList(WmsInspectionMainBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询检验主列表
|
||||
*/
|
||||
List<WmsInspectionMainVo> queryList(WmsInspectionMainBo bo);
|
||||
|
||||
/**
|
||||
* 新增检验主
|
||||
*/
|
||||
Boolean insertByBo(WmsInspectionMainBo bo);
|
||||
|
||||
/**
|
||||
* 修改检验主
|
||||
*/
|
||||
Boolean updateByBo(WmsInspectionMainBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除检验主信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.klp.service;
|
||||
|
||||
import com.klp.domain.WmsInspectionTensileDetail;
|
||||
import com.klp.domain.vo.WmsInspectionTensileDetailVo;
|
||||
import com.klp.domain.bo.WmsInspectionTensileDetailBo;
|
||||
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 2026-06-13
|
||||
*/
|
||||
public interface IWmsInspectionTensileDetailService {
|
||||
|
||||
/**
|
||||
* 查询金属材料室温拉伸试验样品明细
|
||||
*/
|
||||
WmsInspectionTensileDetailVo queryById(String detailId);
|
||||
|
||||
/**
|
||||
* 查询金属材料室温拉伸试验样品明细列表
|
||||
*/
|
||||
TableDataInfo<WmsInspectionTensileDetailVo> queryPageList(WmsInspectionTensileDetailBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询金属材料室温拉伸试验样品明细列表
|
||||
*/
|
||||
List<WmsInspectionTensileDetailVo> queryList(WmsInspectionTensileDetailBo bo);
|
||||
|
||||
/**
|
||||
* 新增金属材料室温拉伸试验样品明细
|
||||
*/
|
||||
Boolean insertByBo(WmsInspectionTensileDetailBo bo);
|
||||
|
||||
/**
|
||||
* 修改金属材料室温拉伸试验样品明细
|
||||
*/
|
||||
Boolean updateByBo(WmsInspectionTensileDetailBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除金属材料室温拉伸试验样品明细信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.klp.service;
|
||||
|
||||
import com.klp.domain.WmsInspectionTensile;
|
||||
import com.klp.domain.vo.WmsInspectionTensileVo;
|
||||
import com.klp.domain.bo.WmsInspectionTensileBo;
|
||||
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 2026-06-13
|
||||
*/
|
||||
public interface IWmsInspectionTensileService {
|
||||
|
||||
/**
|
||||
* 查询金属材料室温拉伸试验主记录
|
||||
*/
|
||||
WmsInspectionTensileVo queryById(String testId);
|
||||
|
||||
/**
|
||||
* 查询金属材料室温拉伸试验主记录列表
|
||||
*/
|
||||
TableDataInfo<WmsInspectionTensileVo> queryPageList(WmsInspectionTensileBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询金属材料室温拉伸试验主记录列表
|
||||
*/
|
||||
List<WmsInspectionTensileVo> queryList(WmsInspectionTensileBo bo);
|
||||
|
||||
/**
|
||||
* 新增金属材料室温拉伸试验主记录
|
||||
*/
|
||||
Boolean insertByBo(WmsInspectionTensileBo bo);
|
||||
|
||||
/**
|
||||
* 修改金属材料室温拉伸试验主记录
|
||||
*/
|
||||
Boolean updateByBo(WmsInspectionTensileBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除金属材料室温拉伸试验主记录信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,115 @@
|
||||
package com.klp.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
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 lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.domain.bo.WmsInspectionDetailBo;
|
||||
import com.klp.domain.vo.WmsInspectionDetailVo;
|
||||
import com.klp.domain.WmsInspectionDetail;
|
||||
import com.klp.mapper.WmsInspectionDetailMapper;
|
||||
import com.klp.service.IWmsInspectionDetailService;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 检验项目明细Service业务层处理
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-13
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsInspectionDetailServiceImpl implements IWmsInspectionDetailService {
|
||||
|
||||
private final WmsInspectionDetailMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询检验项目明细
|
||||
*/
|
||||
@Override
|
||||
public WmsInspectionDetailVo queryById(Long detailId){
|
||||
return baseMapper.selectVoById(detailId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检验项目明细列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsInspectionDetailVo> queryPageList(WmsInspectionDetailBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsInspectionDetail> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsInspectionDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检验项目明细列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsInspectionDetailVo> queryList(WmsInspectionDetailBo bo) {
|
||||
LambdaQueryWrapper<WmsInspectionDetail> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsInspectionDetail> buildQueryWrapper(WmsInspectionDetailBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsInspectionDetail> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getMainId() != null, WmsInspectionDetail::getMainId, bo.getMainId());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getItemName()), WmsInspectionDetail::getItemName, bo.getItemName());
|
||||
lqw.eq(bo.getItemValue() != null, WmsInspectionDetail::getItemValue, bo.getItemValue());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getItemUnit()), WmsInspectionDetail::getItemUnit, bo.getItemUnit());
|
||||
lqw.eq(bo.getUpperLimit() != null, WmsInspectionDetail::getUpperLimit, bo.getUpperLimit());
|
||||
lqw.eq(bo.getLowerLimit() != null, WmsInspectionDetail::getLowerLimit, bo.getLowerLimit());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getRangeDesc()), WmsInspectionDetail::getRangeDesc, bo.getRangeDesc());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增检验项目明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsInspectionDetailBo bo) {
|
||||
WmsInspectionDetail add = BeanUtil.toBean(bo, WmsInspectionDetail.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setDetailId(add.getDetailId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改检验项目明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsInspectionDetailBo bo) {
|
||||
WmsInspectionDetail update = BeanUtil.toBean(bo, WmsInspectionDetail.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsInspectionDetail entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除检验项目明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
package com.klp.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
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 lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.domain.bo.WmsInspectionMainBo;
|
||||
import com.klp.domain.vo.WmsInspectionMainVo;
|
||||
import com.klp.domain.WmsInspectionMain;
|
||||
import com.klp.mapper.WmsInspectionMainMapper;
|
||||
import com.klp.service.IWmsInspectionMainService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 检验主Service业务层处理
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-13
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsInspectionMainServiceImpl implements IWmsInspectionMainService {
|
||||
|
||||
private final WmsInspectionMainMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询检验主
|
||||
*/
|
||||
@Override
|
||||
public WmsInspectionMainVo queryById(Long mainId){
|
||||
return baseMapper.selectVoById(mainId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检验主列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsInspectionMainVo> queryPageList(WmsInspectionMainBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsInspectionMain> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsInspectionMainVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检验主列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsInspectionMainVo> queryList(WmsInspectionMainBo bo) {
|
||||
LambdaQueryWrapper<WmsInspectionMain> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsInspectionMain> buildQueryWrapper(WmsInspectionMainBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsInspectionMain> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getInspectionDate() != null, WmsInspectionMain::getInspectionDate, bo.getInspectionDate());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getSampleName()), WmsInspectionMain::getSampleName, bo.getSampleName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSampleNo()), WmsInspectionMain::getSampleNo, bo.getSampleNo());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getBatchNo()), WmsInspectionMain::getBatchNo, bo.getBatchNo());
|
||||
lqw.eq(bo.getTemplateId() != null, WmsInspectionMain::getTemplateId, bo.getTemplateId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getTaskConfigJson()), WmsInspectionMain::getTaskConfigJson, bo.getTaskConfigJson());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增检验主
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsInspectionMainBo bo) {
|
||||
WmsInspectionMain add = BeanUtil.toBean(bo, WmsInspectionMain.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setMainId(add.getMainId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改检验主
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsInspectionMainBo bo) {
|
||||
WmsInspectionMain update = BeanUtil.toBean(bo, WmsInspectionMain.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsInspectionMain entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除检验主
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,150 @@
|
||||
package com.klp.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
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 lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.domain.bo.WmsInspectionTensileDetailBo;
|
||||
import com.klp.domain.vo.WmsInspectionTensileDetailVo;
|
||||
import com.klp.domain.WmsInspectionTensileDetail;
|
||||
import com.klp.mapper.WmsInspectionTensileDetailMapper;
|
||||
import com.klp.service.IWmsInspectionTensileDetailService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 金属材料室温拉伸试验样品明细Service业务层处理
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-13
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsInspectionTensileDetailServiceImpl implements IWmsInspectionTensileDetailService {
|
||||
|
||||
private final WmsInspectionTensileDetailMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询金属材料室温拉伸试验样品明细
|
||||
*/
|
||||
@Override
|
||||
public WmsInspectionTensileDetailVo queryById(String detailId){
|
||||
return baseMapper.selectVoById(detailId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询金属材料室温拉伸试验样品明细列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsInspectionTensileDetailVo> queryPageList(WmsInspectionTensileDetailBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsInspectionTensileDetail> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsInspectionTensileDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询金属材料室温拉伸试验样品明细列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsInspectionTensileDetailVo> queryList(WmsInspectionTensileDetailBo bo) {
|
||||
LambdaQueryWrapper<WmsInspectionTensileDetail> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsInspectionTensileDetail> buildQueryWrapper(WmsInspectionTensileDetailBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsInspectionTensileDetail> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getTestMainId()), WmsInspectionTensileDetail::getTestMainId, bo.getTestMainId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSampleNo()), WmsInspectionTensileDetail::getSampleNo, bo.getSampleNo());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSteelCoilNo()), WmsInspectionTensileDetail::getSteelCoilNo, bo.getSteelCoilNo());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getRawMaterialNo()), WmsInspectionTensileDetail::getRawMaterialNo, bo.getRawMaterialNo());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSpecification()), WmsInspectionTensileDetail::getSpecification, bo.getSpecification());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), WmsInspectionTensileDetail::getMaterial, bo.getMaterial());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getRawMaterialFactory()), WmsInspectionTensileDetail::getRawMaterialFactory, bo.getRawMaterialFactory());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getProductionTeam()), WmsInspectionTensileDetail::getProductionTeam, bo.getProductionTeam());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStatus()), WmsInspectionTensileDetail::getSurfaceStatus, bo.getSurfaceStatus());
|
||||
lqw.eq(bo.getProductionDate() != null, WmsInspectionTensileDetail::getProductionDate, bo.getProductionDate());
|
||||
lqw.eq(bo.getTestDate() != null, WmsInspectionTensileDetail::getTestDate, bo.getTestDate());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSampleDirection()), WmsInspectionTensileDetail::getSampleDirection, bo.getSampleDirection());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSampleSize()), WmsInspectionTensileDetail::getSampleSize, bo.getSampleSize());
|
||||
lqw.eq(bo.getOriginalGaugeLength() != null, WmsInspectionTensileDetail::getOriginalGaugeLength, bo.getOriginalGaugeLength());
|
||||
lqw.eq(bo.getFractureGaugeLength() != null, WmsInspectionTensileDetail::getFractureGaugeLength, bo.getFractureGaugeLength());
|
||||
lqw.eq(bo.getMaxForce() != null, WmsInspectionTensileDetail::getMaxForce, bo.getMaxForce());
|
||||
lqw.eq(bo.getLowerYieldStrength() != null, WmsInspectionTensileDetail::getLowerYieldStrength, bo.getLowerYieldStrength());
|
||||
lqw.eq(bo.getTensileStrength() != null, WmsInspectionTensileDetail::getTensileStrength, bo.getTensileStrength());
|
||||
lqw.eq(bo.getElongation() != null, WmsInspectionTensileDetail::getElongation, bo.getElongation());
|
||||
lqw.eq(bo.getHardnessHr() != null, WmsInspectionTensileDetail::getHardnessHr, bo.getHardnessHr());
|
||||
lqw.eq(bo.getHardnessHv() != null, WmsInspectionTensileDetail::getHardnessHv, bo.getHardnessHv());
|
||||
lqw.eq(bo.getCoatingWeightTop() != null, WmsInspectionTensileDetail::getCoatingWeightTop, bo.getCoatingWeightTop());
|
||||
lqw.eq(bo.getCoatingWeightBottom() != null, WmsInspectionTensileDetail::getCoatingWeightBottom, bo.getCoatingWeightBottom());
|
||||
lqw.eq(bo.getCoatingWeightAvg() != null, WmsInspectionTensileDetail::getCoatingWeightAvg, bo.getCoatingWeightAvg());
|
||||
lqw.eq(bo.getRoughness() != null, WmsInspectionTensileDetail::getRoughness, bo.getRoughness());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getBendTest90()), WmsInspectionTensileDetail::getBendTest90, bo.getBendTest90());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getBendTest180()), WmsInspectionTensileDetail::getBendTest180, bo.getBendTest180());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getBendTestDirection()), WmsInspectionTensileDetail::getBendTestDirection, bo.getBendTestDirection());
|
||||
lqw.eq(bo.getCuppingValue() != null, WmsInspectionTensileDetail::getCuppingValue, bo.getCuppingValue());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStructure()), WmsInspectionTensileDetail::getSurfaceStructure, bo.getSurfaceStructure());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getEdgeStatus()), WmsInspectionTensileDetail::getEdgeStatus, bo.getEdgeStatus());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceQuality()), WmsInspectionTensileDetail::getSurfaceQuality, bo.getSurfaceQuality());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSaltSprayTest()), WmsInspectionTensileDetail::getSaltSprayTest, bo.getSaltSprayTest());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceTreatment()), WmsInspectionTensileDetail::getSurfaceTreatment, bo.getSurfaceTreatment());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getPostTreatment()), WmsInspectionTensileDetail::getPostTreatment, bo.getPostTreatment());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getNextProcess()), WmsInspectionTensileDetail::getNextProcess, bo.getNextProcess());
|
||||
lqw.eq(bo.getCContent() != null, WmsInspectionTensileDetail::getCContent, bo.getCContent());
|
||||
lqw.eq(bo.getSiContent() != null, WmsInspectionTensileDetail::getSiContent, bo.getSiContent());
|
||||
lqw.eq(bo.getMnContent() != null, WmsInspectionTensileDetail::getMnContent, bo.getMnContent());
|
||||
lqw.eq(bo.getPContent() != null, WmsInspectionTensileDetail::getPContent, bo.getPContent());
|
||||
lqw.eq(bo.getSContent() != null, WmsInspectionTensileDetail::getSContent, bo.getSContent());
|
||||
lqw.eq(bo.getAlContent() != null, WmsInspectionTensileDetail::getAlContent, bo.getAlContent());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增金属材料室温拉伸试验样品明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsInspectionTensileDetailBo bo) {
|
||||
WmsInspectionTensileDetail add = BeanUtil.toBean(bo, WmsInspectionTensileDetail.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setDetailId(add.getDetailId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改金属材料室温拉伸试验样品明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsInspectionTensileDetailBo bo) {
|
||||
WmsInspectionTensileDetail update = BeanUtil.toBean(bo, WmsInspectionTensileDetail.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsInspectionTensileDetail entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除金属材料室温拉伸试验样品明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,115 @@
|
||||
package com.klp.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
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 lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.domain.bo.WmsInspectionTensileBo;
|
||||
import com.klp.domain.vo.WmsInspectionTensileVo;
|
||||
import com.klp.domain.WmsInspectionTensile;
|
||||
import com.klp.mapper.WmsInspectionTensileMapper;
|
||||
import com.klp.service.IWmsInspectionTensileService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 金属材料室温拉伸试验主记录Service业务层处理
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-06-13
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsInspectionTensileServiceImpl implements IWmsInspectionTensileService {
|
||||
|
||||
private final WmsInspectionTensileMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询金属材料室温拉伸试验主记录
|
||||
*/
|
||||
@Override
|
||||
public WmsInspectionTensileVo queryById(String testId){
|
||||
return baseMapper.selectVoById(testId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询金属材料室温拉伸试验主记录列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsInspectionTensileVo> queryPageList(WmsInspectionTensileBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsInspectionTensile> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsInspectionTensileVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询金属材料室温拉伸试验主记录列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsInspectionTensileVo> queryList(WmsInspectionTensileBo bo) {
|
||||
LambdaQueryWrapper<WmsInspectionTensile> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsInspectionTensile> buildQueryWrapper(WmsInspectionTensileBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsInspectionTensile> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getTestTitle()), WmsInspectionTensile::getTestTitle, bo.getTestTitle());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getExecuteStandard()), WmsInspectionTensile::getExecuteStandard, bo.getExecuteStandard());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getEquipmentName()), WmsInspectionTensile::getEquipmentName, bo.getEquipmentName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getEquipmentModel()), WmsInspectionTensile::getEquipmentModel, bo.getEquipmentModel());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getTestTemp()), WmsInspectionTensile::getTestTemp, bo.getTestTemp());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getTestHumidity()), WmsInspectionTensile::getTestHumidity, bo.getTestHumidity());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getProductionProcess()), WmsInspectionTensile::getProductionProcess, bo.getProductionProcess());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增金属材料室温拉伸试验主记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsInspectionTensileBo bo) {
|
||||
WmsInspectionTensile add = BeanUtil.toBean(bo, WmsInspectionTensile.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setTestId(add.getTestId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改金属材料室温拉伸试验主记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsInspectionTensileBo bo) {
|
||||
WmsInspectionTensile update = BeanUtil.toBean(bo, WmsInspectionTensile.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsInspectionTensile entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除金属材料室温拉伸试验主记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user