feat(is): 添加检验委托单、检验任务和样品库存相关功能- 新增检验委托单、检验任务和样品库存的实体类、BO、VO

- 实现检验委托单、检验任务和样品库存的增删查改功能
- 添加检验任务与委托单的关联查询

klp-mes/src/main/java/com/klp/mes/is/service/IIsInspectionCommissionService.java

@@ -0,0 +1,49 @@
+package com.klp.mes.is.service;
+
+import com.klp.mes.is.domain.IsInspectionCommission;
+import com.klp.mes.is.domain.vo.IsInspectionCommissionVo;
+import com.klp.mes.is.domain.bo.IsInspectionCommissionBo;
+import com.klp.common.core.page.TableDataInfo;
+import com.klp.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 检验委托单表Service接口
+ *
+ * @author Joshi
+ * @date 2025-08-15
+ */
+public interface IIsInspectionCommissionService {
+
+    /**
+     * 查询检验委托单表
+     */
+    IsInspectionCommissionVo queryById(Long commissionId);
+
+    /**
+     * 查询检验委托单表列表
+     */
+    TableDataInfo<IsInspectionCommissionVo> queryPageList(IsInspectionCommissionBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询检验委托单表列表
+     */
+    List<IsInspectionCommissionVo> queryList(IsInspectionCommissionBo bo);
+
+    /**
+     * 新增检验委托单表
+     */
+    Boolean insertByBo(IsInspectionCommissionBo bo);
+
+    /**
+     * 修改检验委托单表
+     */
+    Boolean updateByBo(IsInspectionCommissionBo bo);
+
+    /**
+     * 校验并批量删除检验委托单表信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

klp-mes/src/main/java/com/klp/mes/is/service/IIsInspectionTaskService.java

@@ -0,0 +1,49 @@
+package com.klp.mes.is.service;
+
+import com.klp.mes.is.domain.IsInspectionTask;
+import com.klp.mes.is.domain.vo.IsInspectionTaskVo;
+import com.klp.mes.is.domain.bo.IsInspectionTaskBo;
+import com.klp.common.core.page.TableDataInfo;
+import com.klp.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 检验任务表Service接口
+ *
+ * @author Joshi
+ * @date 2025-08-15
+ */
+public interface IIsInspectionTaskService {
+
+    /**
+     * 查询检验任务表
+     */
+    IsInspectionTaskVo queryById(Long taskId);
+
+    /**
+     * 查询检验任务表列表
+     */
+    TableDataInfo<IsInspectionTaskVo> queryPageList(IsInspectionTaskBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询检验任务表列表
+     */
+    List<IsInspectionTaskVo> queryList(IsInspectionTaskBo bo);
+
+    /**
+     * 新增检验任务表
+     */
+    Boolean insertByBo(IsInspectionTaskBo bo);
+
+    /**
+     * 修改检验任务表
+     */
+    Boolean updateByBo(IsInspectionTaskBo bo);
+
+    /**
+     * 校验并批量删除检验任务表信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

klp-mes/src/main/java/com/klp/mes/is/service/IIsSampleInventoryService.java

@@ -0,0 +1,49 @@
+package com.klp.mes.is.service;
+
+import com.klp.mes.is.domain.IsSampleInventory;
+import com.klp.mes.is.domain.vo.IsSampleInventoryVo;
+import com.klp.mes.is.domain.bo.IsSampleInventoryBo;
+import com.klp.common.core.page.TableDataInfo;
+import com.klp.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 样品库存表Service接口
+ *
+ * @author Joshi
+ * @date 2025-08-15
+ */
+public interface IIsSampleInventoryService {
+
+    /**
+     * 查询样品库存表
+     */
+    IsSampleInventoryVo queryById(Long sampleId);
+
+    /**
+     * 查询样品库存表列表
+     */
+    TableDataInfo<IsSampleInventoryVo> queryPageList(IsSampleInventoryBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询样品库存表列表
+     */
+    List<IsSampleInventoryVo> queryList(IsSampleInventoryBo bo);
+
+    /**
+     * 新增样品库存表
+     */
+    Boolean insertByBo(IsSampleInventoryBo bo);
+
+    /**
+     * 修改样品库存表
+     */
+    Boolean updateByBo(IsSampleInventoryBo bo);
+
+    /**
+     * 校验并批量删除样品库存表信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

klp-mes/src/main/java/com/klp/mes/is/service/impl/IsInspectionCommissionServiceImpl.java

@@ -0,0 +1,117 @@
+package com.klp.mes.is.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.mes.is.domain.bo.IsInspectionCommissionBo;
+import com.klp.mes.is.domain.vo.IsInspectionCommissionVo;
+import com.klp.mes.is.domain.IsInspectionCommission;
+import com.klp.mes.is.mapper.IsInspectionCommissionMapper;
+import com.klp.mes.is.service.IIsInspectionCommissionService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 检验委托单表Service业务层处理
+ *
+ * @author Joshi
+ * @date 2025-08-15
+ */
+@RequiredArgsConstructor
+@Service
+public class IsInspectionCommissionServiceImpl implements IIsInspectionCommissionService {
+
+    private final IsInspectionCommissionMapper baseMapper;
+
+    /**
+     * 查询检验委托单表
+     */
+    @Override
+    public IsInspectionCommissionVo queryById(Long commissionId){
+        return baseMapper.selectVoById(commissionId);
+    }
+
+    /**
+     * 查询检验委托单表列表
+     */
+    @Override
+    public TableDataInfo<IsInspectionCommissionVo> queryPageList(IsInspectionCommissionBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<IsInspectionCommission> lqw = buildQueryWrapper(bo);
+        Page<IsInspectionCommissionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询检验委托单表列表
+     */
+    @Override
+    public List<IsInspectionCommissionVo> queryList(IsInspectionCommissionBo bo) {
+        LambdaQueryWrapper<IsInspectionCommission> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<IsInspectionCommission> buildQueryWrapper(IsInspectionCommissionBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<IsInspectionCommission> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getCommissionNo()), IsInspectionCommission::getCommissionNo, bo.getCommissionNo());
+        lqw.eq(bo.getClientId() != null, IsInspectionCommission::getClientId, bo.getClientId());
+        lqw.like(StringUtils.isNotBlank(bo.getSampleName()), IsInspectionCommission::getSampleName, bo.getSampleName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSampleType()), IsInspectionCommission::getSampleType, bo.getSampleType());
+        lqw.eq(bo.getQuantity() != null, IsInspectionCommission::getQuantity, bo.getQuantity());
+        lqw.eq(StringUtils.isNotBlank(bo.getInspectionItems()), IsInspectionCommission::getInspectionItems, bo.getInspectionItems());
+        lqw.eq(bo.getCommissionDate() != null, IsInspectionCommission::getCommissionDate, bo.getCommissionDate());
+        lqw.eq(bo.getDeadline() != null, IsInspectionCommission::getDeadline, bo.getDeadline());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), IsInspectionCommission::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增检验委托单表
+     */
+    @Override
+    public Boolean insertByBo(IsInspectionCommissionBo bo) {
+        IsInspectionCommission add = BeanUtil.toBean(bo, IsInspectionCommission.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setCommissionId(add.getCommissionId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改检验委托单表
+     */
+    @Override
+    public Boolean updateByBo(IsInspectionCommissionBo bo) {
+        IsInspectionCommission update = BeanUtil.toBean(bo, IsInspectionCommission.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(IsInspectionCommission entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除检验委托单表
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

klp-mes/src/main/java/com/klp/mes/is/service/impl/IsInspectionTaskServiceImpl.java

@@ -0,0 +1,116 @@
+package com.klp.mes.is.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.mes.is.domain.bo.IsInspectionTaskBo;
+import com.klp.mes.is.domain.vo.IsInspectionTaskVo;
+import com.klp.mes.is.domain.IsInspectionTask;
+import com.klp.mes.is.mapper.IsInspectionTaskMapper;
+import com.klp.mes.is.service.IIsInspectionTaskService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 检验任务表Service业务层处理
+ *
+ * @author Joshi
+ * @date 2025-08-15
+ */
+@RequiredArgsConstructor
+@Service
+public class IsInspectionTaskServiceImpl implements IIsInspectionTaskService {
+
+    private final IsInspectionTaskMapper baseMapper;
+
+    /**
+     * 查询检验任务表
+     */
+    @Override
+    public IsInspectionTaskVo queryById(Long taskId){
+        return baseMapper.selectVoById(taskId);
+    }
+
+    /**
+     * 查询检验任务表列表
+     */
+    @Override
+    public TableDataInfo<IsInspectionTaskVo> queryPageList(IsInspectionTaskBo bo, PageQuery pageQuery) {
+        Page<IsInspectionTaskVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询检验任务表列表
+     */
+    @Override
+    public List<IsInspectionTaskVo> queryList(IsInspectionTaskBo bo) {
+        LambdaQueryWrapper<IsInspectionTask> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<IsInspectionTask> buildQueryWrapper(IsInspectionTaskBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<IsInspectionTask> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getTaskNo()), IsInspectionTask::getTaskNo, bo.getTaskNo());
+        lqw.eq(bo.getCommissionId() != null, IsInspectionTask::getCommissionId, bo.getCommissionId());
+        lqw.eq(bo.getAssignedTo() != null, IsInspectionTask::getAssignedTo, bo.getAssignedTo());
+        lqw.eq(bo.getStartTime() != null, IsInspectionTask::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, IsInspectionTask::getEndTime, bo.getEndTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getResult()), IsInspectionTask::getResult, bo.getResult());
+        lqw.eq(StringUtils.isNotBlank(bo.getConclusion()), IsInspectionTask::getConclusion, bo.getConclusion());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), IsInspectionTask::getStatus, bo.getStatus());
+        lqw.eq(bo.getPriority() != null, IsInspectionTask::getPriority, bo.getPriority());
+        return lqw;
+    }
+
+    /**
+     * 新增检验任务表
+     */
+    @Override
+    public Boolean insertByBo(IsInspectionTaskBo bo) {
+        IsInspectionTask add = BeanUtil.toBean(bo, IsInspectionTask.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setTaskId(add.getTaskId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改检验任务表
+     */
+    @Override
+    public Boolean updateByBo(IsInspectionTaskBo bo) {
+        IsInspectionTask update = BeanUtil.toBean(bo, IsInspectionTask.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(IsInspectionTask entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除检验任务表
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

klp-mes/src/main/java/com/klp/mes/is/service/impl/IsSampleInventoryServiceImpl.java

@@ -0,0 +1,115 @@
+package com.klp.mes.is.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.mes.is.domain.bo.IsSampleInventoryBo;
+import com.klp.mes.is.domain.vo.IsSampleInventoryVo;
+import com.klp.mes.is.domain.IsSampleInventory;
+import com.klp.mes.is.mapper.IsSampleInventoryMapper;
+import com.klp.mes.is.service.IIsSampleInventoryService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 样品库存表Service业务层处理
+ *
+ * @author Joshi
+ * @date 2025-08-15
+ */
+@RequiredArgsConstructor
+@Service
+public class IsSampleInventoryServiceImpl implements IIsSampleInventoryService {
+
+    private final IsSampleInventoryMapper baseMapper;
+
+    /**
+     * 查询样品库存表
+     */
+    @Override
+    public IsSampleInventoryVo queryById(Long sampleId){
+        return baseMapper.selectVoById(sampleId);
+    }
+
+    /**
+     * 查询样品库存表列表
+     */
+    @Override
+    public TableDataInfo<IsSampleInventoryVo> queryPageList(IsSampleInventoryBo bo, PageQuery pageQuery) {
+        Page<IsSampleInventoryVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询样品库存表列表
+     */
+    @Override
+    public List<IsSampleInventoryVo> queryList(IsSampleInventoryBo bo) {
+        LambdaQueryWrapper<IsSampleInventory> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<IsSampleInventory> buildQueryWrapper(IsSampleInventoryBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<IsSampleInventory> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getCommissionId() != null, IsSampleInventory::getCommissionId, bo.getCommissionId());
+        lqw.eq(StringUtils.isNotBlank(bo.getLocation()), IsSampleInventory::getLocation, bo.getLocation());
+        lqw.eq(bo.getCurrentQuantity() != null, IsSampleInventory::getCurrentQuantity, bo.getCurrentQuantity());
+        lqw.eq(bo.getStorageTime() != null, IsSampleInventory::getStorageTime, bo.getStorageTime());
+        lqw.eq(bo.getExpirationDate() != null, IsSampleInventory::getExpirationDate, bo.getExpirationDate());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), IsSampleInventory::getStatus, bo.getStatus());
+        lqw.eq(bo.getOperatorId() != null, IsSampleInventory::getOperatorId, bo.getOperatorId());
+        lqw.eq(bo.getLastUpdate() != null, IsSampleInventory::getLastUpdate, bo.getLastUpdate());
+        return lqw;
+    }
+
+    /**
+     * 新增样品库存表
+     */
+    @Override
+    public Boolean insertByBo(IsSampleInventoryBo bo) {
+        IsSampleInventory add = BeanUtil.toBean(bo, IsSampleInventory.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setSampleId(add.getSampleId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改样品库存表
+     */
+    @Override
+    public Boolean updateByBo(IsSampleInventoryBo bo) {
+        IsSampleInventory update = BeanUtil.toBean(bo, IsSampleInventory.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(IsSampleInventory entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除样品库存表
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}