diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java index 1e36f967..481fba25 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java @@ -4,6 +4,7 @@ import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.*; +import java.util.List; /** @@ -21,7 +22,8 @@ public class WmsCheckTaskBo extends BaseEntity { * 主键 */ private Long taskId; - + //检查项id + private List itemId; /** * 任务名称 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java index 5de1ccf8..1c873f1d 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java @@ -37,5 +37,9 @@ public class WmsCheckTaskVo { @ExcelProperty(value = "备注") private String remark; + /** + * 检查项列表 + */ + private java.util.List itemList; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java index db2957f2..e3cd586d 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java @@ -1,5 +1,7 @@ package com.klp.mes.qc.mapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.klp.mes.qc.domain.WmsCheckTask; import com.klp.mes.qc.domain.vo.WmsCheckTaskVo; import com.klp.common.core.mapper.BaseMapperPlus; @@ -12,4 +14,5 @@ import com.klp.common.core.mapper.BaseMapperPlus; */ public interface WmsCheckTaskMapper extends BaseMapperPlus { + Page selectVoPagePlus(Page build, LambdaQueryWrapper lqw); } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskService.java index 6ae89eb1..9ca2209c 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskService.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskService.java @@ -35,7 +35,7 @@ public interface IWmsCheckTaskService { /** * 新增检查任务 */ - Boolean insertByBo(WmsCheckTaskBo bo); + int insertByBo(WmsCheckTaskBo bo); /** * 修改检查任务 diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java index 4cc65285..3268d6c6 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java @@ -7,6 +7,8 @@ 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.domain.WmsCheckTaskItem; +import com.klp.mes.qc.mapper.WmsCheckTaskItemMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.klp.mes.qc.domain.bo.WmsCheckTaskBo; @@ -14,6 +16,7 @@ import com.klp.mes.qc.domain.vo.WmsCheckTaskVo; import com.klp.mes.qc.domain.WmsCheckTask; import com.klp.mes.qc.mapper.WmsCheckTaskMapper; import com.klp.mes.qc.service.IWmsCheckTaskService; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @@ -30,6 +33,7 @@ import java.util.Collection; public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService { private final WmsCheckTaskMapper baseMapper; + private final WmsCheckTaskItemMapper wmsCheckTaskItemMapper; /** * 查询检查任务 @@ -45,7 +49,7 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService { @Override public TableDataInfo queryPageList(WmsCheckTaskBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -68,15 +72,28 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService { /** * 新增检查任务 */ + @Transactional() @Override - public Boolean insertByBo(WmsCheckTaskBo bo) { + public int insertByBo(WmsCheckTaskBo bo) { WmsCheckTask add = BeanUtil.toBean(bo, WmsCheckTask.class); validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { + boolean mainFlag = baseMapper.insert(add) > 0; + int count = 0; + for (Long itemId : bo.getItemId()) { + WmsCheckTaskItem wmsCheckTaskItem = new WmsCheckTaskItem(); + wmsCheckTaskItem.setCheckTaskId(add.getTaskId()); + wmsCheckTaskItem.setCheckItemId(itemId); + int insertCount = wmsCheckTaskItemMapper.insert(wmsCheckTaskItem); + if (insertCount <= 0) { + throw new RuntimeException("新增检查任务失败,检查项ID:" + itemId); + } else { + count++; + } + } + if (mainFlag) { bo.setTaskId(add.getTaskId()); } - return flag; + return count; } /** diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml index f03b3c5b..2148f892 100644 --- a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml @@ -14,6 +14,15 @@ +