feat(mes): 实现检查任务查询时关联钢卷信息的加载功能
- 将WmsCheckTaskCoilRelation相关实体、服务、控制器从WMS模块迁移到MES模块 - 更新包路径从com.klp到com.klp.mes.qc下对应层级 - 在WmsCheckTaskBo中添加coilIds字段用于绑定钢卷ID - 在WmsCheckTaskVo中添加coilList字段显示关联钢卷信息 - 实现检查任务查询时关联钢卷信息的加载功能 - 添加批量删除检查任务时同步删除钢卷关联记录的逻辑 - 在pom.xml中添加klp-wms模块依赖以便MES模块访问WMS数据 - 新增deleteByTaskIds方法支持按任务ID批量删除钢卷关联记录
This commit is contained in:
@@ -24,5 +24,9 @@
|
||||
<artifactId>klp-system</artifactId>
|
||||
<version>0.8.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.klp</groupId>
|
||||
<artifactId>klp-wms</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.mes.qc.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
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.WmsCheckTaskCoilRelationVo;
|
||||
import com.klp.mes.qc.domain.bo.WmsCheckTaskCoilRelationBo;
|
||||
import com.klp.mes.qc.service.IWmsCheckTaskCoilRelationService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 检查任务与钢卷关联
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-02-03
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/wms/checkTaskCoilRelation")
|
||||
public class WmsCheckTaskCoilRelationController extends BaseController {
|
||||
|
||||
private final IWmsCheckTaskCoilRelationService iWmsCheckTaskCoilRelationService;
|
||||
|
||||
/**
|
||||
* 查询检查任务与钢卷关联列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsCheckTaskCoilRelationVo> list(WmsCheckTaskCoilRelationBo bo, PageQuery pageQuery) {
|
||||
return iWmsCheckTaskCoilRelationService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出检查任务与钢卷关联列表
|
||||
*/
|
||||
@Log(title = "检查任务与钢卷关联", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsCheckTaskCoilRelationBo bo, HttpServletResponse response) {
|
||||
List<WmsCheckTaskCoilRelationVo> list = iWmsCheckTaskCoilRelationService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "检查任务与钢卷关联", WmsCheckTaskCoilRelationVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取检查任务与钢卷关联详细信息
|
||||
*
|
||||
* @param relationId 主键
|
||||
*/
|
||||
@GetMapping("/{relationId}")
|
||||
public R<WmsCheckTaskCoilRelationVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long relationId) {
|
||||
return R.ok(iWmsCheckTaskCoilRelationService.queryById(relationId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增检查任务与钢卷关联
|
||||
*/
|
||||
@Log(title = "检查任务与钢卷关联", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsCheckTaskCoilRelationBo bo) {
|
||||
return toAjax(iWmsCheckTaskCoilRelationService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改检查任务与钢卷关联
|
||||
*/
|
||||
@Log(title = "检查任务与钢卷关联", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsCheckTaskCoilRelationBo bo) {
|
||||
return toAjax(iWmsCheckTaskCoilRelationService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除检查任务与钢卷关联
|
||||
*
|
||||
* @param relationIds 主键串
|
||||
*/
|
||||
@Log(title = "检查任务与钢卷关联", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{relationIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] relationIds) {
|
||||
return toAjax(iWmsCheckTaskCoilRelationService.deleteWithValidByIds(Arrays.asList(relationIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
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_check_task_coil_relation
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-02-03
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wms_check_task_coil_relation")
|
||||
public class WmsCheckTaskCoilRelation extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 关联表主键
|
||||
*/
|
||||
@TableId(value = "relation_id")
|
||||
private Long relationId;
|
||||
/**
|
||||
* 检查任务ID,关联wms_check_task.task_id
|
||||
*/
|
||||
private Long taskId;
|
||||
/**
|
||||
* 钢卷ID
|
||||
*/
|
||||
private String coilId;
|
||||
/**
|
||||
* 逻辑删除标识:0=正常,1=已删
|
||||
*/
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
|
||||
}
|
||||
@@ -52,5 +52,7 @@ public class WmsCheckTaskBo extends BaseEntity {
|
||||
// 检验类型
|
||||
private String inspectionType;
|
||||
|
||||
// 绑定的钢卷ID(逗号分隔)
|
||||
private String coilIds;
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
package com.klp.mes.qc.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
|
||||
/**
|
||||
* 检查任务与钢卷关联业务对象 wms_check_task_coil_relation
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-02-03
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WmsCheckTaskCoilRelationBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 关联表主键
|
||||
*/
|
||||
private Long relationId;
|
||||
|
||||
/**
|
||||
* 检查任务ID,关联wms_check_task.task_id
|
||||
*/
|
||||
private Long taskId;
|
||||
|
||||
/**
|
||||
* 钢卷ID
|
||||
*/
|
||||
private String coilId;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package com.klp.mes.qc.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 检查任务与钢卷关联视图对象 wms_check_task_coil_relation
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-02-03
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsCheckTaskCoilRelationVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 关联表主键
|
||||
*/
|
||||
@ExcelProperty(value = "关联表主键")
|
||||
private Long relationId;
|
||||
|
||||
/**
|
||||
* 检查任务ID,关联wms_check_task.task_id
|
||||
*/
|
||||
@ExcelProperty(value = "检查任务ID,关联wms_check_task.task_id")
|
||||
private Long taskId;
|
||||
|
||||
/**
|
||||
* 钢卷ID
|
||||
*/
|
||||
@ExcelProperty(value = "钢卷ID")
|
||||
private String coilId;
|
||||
|
||||
|
||||
}
|
||||
@@ -2,8 +2,7 @@ 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 com.klp.domain.vo.WmsMaterialCoilVo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
@@ -90,4 +89,7 @@ public class WmsCheckTaskVo {
|
||||
private String actualMeasures;
|
||||
|
||||
private String checkTaskItemIds;
|
||||
|
||||
// 绑定的钢卷ID列表
|
||||
private List<WmsMaterialCoilVo> coilList;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.klp.mes.qc.mapper;
|
||||
|
||||
import com.klp.mes.qc.domain.WmsCheckTaskCoilRelation;
|
||||
import com.klp.mes.qc.domain.vo.WmsCheckTaskCoilRelationVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 检查任务与钢卷关联Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-02-03
|
||||
*/
|
||||
public interface WmsCheckTaskCoilRelationMapper extends BaseMapperPlus<WmsCheckTaskCoilRelationMapper, WmsCheckTaskCoilRelation, WmsCheckTaskCoilRelationVo> {
|
||||
|
||||
void deleteByTaskIds(Collection<Long> taskIds);
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.klp.mes.qc.service;
|
||||
|
||||
import com.klp.mes.qc.domain.vo.WmsCheckTaskCoilRelationVo;
|
||||
import com.klp.mes.qc.domain.bo.WmsCheckTaskCoilRelationBo;
|
||||
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-02-03
|
||||
*/
|
||||
public interface IWmsCheckTaskCoilRelationService {
|
||||
|
||||
/**
|
||||
* 查询检查任务与钢卷关联
|
||||
*/
|
||||
WmsCheckTaskCoilRelationVo queryById(Long relationId);
|
||||
|
||||
/**
|
||||
* 查询检查任务与钢卷关联列表
|
||||
*/
|
||||
TableDataInfo<WmsCheckTaskCoilRelationVo> queryPageList(WmsCheckTaskCoilRelationBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询检查任务与钢卷关联列表
|
||||
*/
|
||||
List<WmsCheckTaskCoilRelationVo> queryList(WmsCheckTaskCoilRelationBo bo);
|
||||
|
||||
/**
|
||||
* 新增检查任务与钢卷关联
|
||||
*/
|
||||
Boolean insertByBo(WmsCheckTaskCoilRelationBo bo);
|
||||
|
||||
/**
|
||||
* 修改检查任务与钢卷关联
|
||||
*/
|
||||
Boolean updateByBo(WmsCheckTaskCoilRelationBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除检查任务与钢卷关联信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
package com.klp.mes.qc.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 com.klp.mes.qc.domain.vo.WmsCheckTaskCoilRelationVo;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.mes.qc.domain.bo.WmsCheckTaskCoilRelationBo;
|
||||
import com.klp.mes.qc.domain.vo.WmsCheckTaskCoilRelationVo;
|
||||
import com.klp.mes.qc.domain.WmsCheckTaskCoilRelation;
|
||||
import com.klp.mes.qc.mapper.WmsCheckTaskCoilRelationMapper;
|
||||
import com.klp.mes.qc.service.IWmsCheckTaskCoilRelationService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 检查任务与钢卷关联Service业务层处理
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-02-03
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsCheckTaskCoilRelationServiceImpl implements IWmsCheckTaskCoilRelationService {
|
||||
|
||||
private final WmsCheckTaskCoilRelationMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询检查任务与钢卷关联
|
||||
*/
|
||||
@Override
|
||||
public WmsCheckTaskCoilRelationVo queryById(Long relationId){
|
||||
return baseMapper.selectVoById(relationId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检查任务与钢卷关联列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsCheckTaskCoilRelationVo> queryPageList(WmsCheckTaskCoilRelationBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsCheckTaskCoilRelation> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsCheckTaskCoilRelationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检查任务与钢卷关联列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsCheckTaskCoilRelationVo> queryList(WmsCheckTaskCoilRelationBo bo) {
|
||||
LambdaQueryWrapper<WmsCheckTaskCoilRelation> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsCheckTaskCoilRelation> buildQueryWrapper(WmsCheckTaskCoilRelationBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsCheckTaskCoilRelation> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getTaskId() != null, WmsCheckTaskCoilRelation::getTaskId, bo.getTaskId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCoilId()), WmsCheckTaskCoilRelation::getCoilId, bo.getCoilId());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增检查任务与钢卷关联
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsCheckTaskCoilRelationBo bo) {
|
||||
WmsCheckTaskCoilRelation add = BeanUtil.toBean(bo, WmsCheckTaskCoilRelation.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setRelationId(add.getRelationId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改检查任务与钢卷关联
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsCheckTaskCoilRelationBo bo) {
|
||||
WmsCheckTaskCoilRelation update = BeanUtil.toBean(bo, WmsCheckTaskCoilRelation.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsCheckTaskCoilRelation entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除检查任务与钢卷关联
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -8,11 +8,16 @@ 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.domain.WmsMaterialCoil;
|
||||
import com.klp.domain.vo.WmsMaterialCoilVo;
|
||||
import com.klp.mapper.WmsMaterialCoilMapper;
|
||||
import com.klp.mes.qc.domain.WmsCheckItem;
|
||||
import com.klp.mes.qc.domain.WmsCheckTaskItem;
|
||||
import com.klp.mes.qc.domain.WmsCheckTaskCoilRelation;
|
||||
import com.klp.mes.qc.domain.vo.WmsCheckItemVo;
|
||||
import com.klp.mes.qc.mapper.WmsCheckItemMapper;
|
||||
import com.klp.mes.qc.mapper.WmsCheckTaskItemMapper;
|
||||
import com.klp.mes.qc.mapper.WmsCheckTaskCoilRelationMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.mes.qc.domain.bo.WmsCheckTaskBo;
|
||||
@@ -38,6 +43,8 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
|
||||
private final WmsCheckTaskMapper baseMapper;
|
||||
private final WmsCheckItemMapper wmsCheckItemMapper;
|
||||
private final WmsCheckTaskItemMapper wmsCheckTaskItemMapper;
|
||||
private final WmsCheckTaskCoilRelationMapper wmsCheckTaskCoilRelationMapper;
|
||||
private final WmsMaterialCoilMapper wmsMaterialCoilMapper;
|
||||
|
||||
/**
|
||||
* 查询检查任务
|
||||
@@ -91,9 +98,45 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
|
||||
}
|
||||
vo.setItemList(itemList);
|
||||
}
|
||||
|
||||
// 查询关联的钢卷信息
|
||||
List<WmsCheckTaskCoilRelation> coilRelations = null;
|
||||
if (vo != null) {
|
||||
coilRelations = wmsCheckTaskCoilRelationMapper.selectList(
|
||||
Wrappers.<WmsCheckTaskCoilRelation>lambdaQuery()
|
||||
.eq(WmsCheckTaskCoilRelation::getTaskId, vo.getTaskId())
|
||||
.eq(WmsCheckTaskCoilRelation::getDelFlag, 0)
|
||||
);
|
||||
}
|
||||
|
||||
if (coilRelations != null && !coilRelations.isEmpty()) {
|
||||
Set<String> coilIdSet = new HashSet<>();
|
||||
for (WmsCheckTaskCoilRelation relation : coilRelations) {
|
||||
coilIdSet.add(relation.getCoilId());
|
||||
}
|
||||
|
||||
// 查询钢卷基础信息
|
||||
List<WmsMaterialCoilVo> coilList = queryCoilsByIds(coilIdSet);
|
||||
vo.setCoilList(coilList);
|
||||
}
|
||||
|
||||
return vo;
|
||||
}
|
||||
|
||||
private List<WmsMaterialCoilVo> queryCoilsByIds(Set<String> coilIds) {
|
||||
if (coilIds == null || coilIds.isEmpty()) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
QueryWrapper<WmsMaterialCoil> qw = new QueryWrapper<>();
|
||||
qw.in("coil_id", coilIds);
|
||||
qw.eq("del_flag", 0);
|
||||
// 根据创建时间倒序
|
||||
qw.orderByDesc("create_time");
|
||||
|
||||
return wmsMaterialCoilMapper.selectVoList(qw);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询检查任务列表
|
||||
@@ -102,6 +145,29 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
|
||||
public TableDataInfo<WmsCheckTaskVo> queryPageList(WmsCheckTaskBo bo, PageQuery pageQuery) {
|
||||
QueryWrapper<WmsCheckTask> qw = buildQueryWrapperPlus(bo);
|
||||
Page<WmsCheckTaskVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
|
||||
|
||||
// 处理结果中的钢卷信息
|
||||
List<WmsCheckTaskVo> records = result.getRecords();
|
||||
for (WmsCheckTaskVo vo : records) {
|
||||
// 查询关联的钢卷信息
|
||||
List<WmsCheckTaskCoilRelation> coilRelations = wmsCheckTaskCoilRelationMapper.selectList(
|
||||
Wrappers.<WmsCheckTaskCoilRelation>lambdaQuery()
|
||||
.eq(WmsCheckTaskCoilRelation::getTaskId, vo.getTaskId())
|
||||
.eq(WmsCheckTaskCoilRelation::getDelFlag, 0)
|
||||
);
|
||||
|
||||
if (!coilRelations.isEmpty()) {
|
||||
Set<String> coilIdSet = new HashSet<>();
|
||||
for (WmsCheckTaskCoilRelation relation : coilRelations) {
|
||||
coilIdSet.add(relation.getCoilId());
|
||||
}
|
||||
|
||||
// 查询钢卷基础信息
|
||||
List<WmsMaterialCoilVo> coilList = queryCoilsByIds(coilIdSet);
|
||||
vo.setCoilList(coilList);
|
||||
}
|
||||
}
|
||||
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
private QueryWrapper<WmsCheckTask> buildQueryWrapperPlus(WmsCheckTaskBo bo) {
|
||||
@@ -137,7 +203,30 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
|
||||
@Override
|
||||
public List<WmsCheckTaskVo> queryList(WmsCheckTaskBo bo) {
|
||||
LambdaQueryWrapper<WmsCheckTask> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
List<WmsCheckTaskVo> result = baseMapper.selectVoList(lqw);
|
||||
|
||||
// 处理结果中的钢卷信息
|
||||
for (WmsCheckTaskVo vo : result) {
|
||||
// 查询关联的钢卷信息
|
||||
List<WmsCheckTaskCoilRelation> coilRelations = wmsCheckTaskCoilRelationMapper.selectList(
|
||||
Wrappers.<WmsCheckTaskCoilRelation>lambdaQuery()
|
||||
.eq(WmsCheckTaskCoilRelation::getTaskId, vo.getTaskId())
|
||||
.eq(WmsCheckTaskCoilRelation::getDelFlag, 0)
|
||||
);
|
||||
|
||||
if (!coilRelations.isEmpty()) {
|
||||
Set<String> coilIdSet = new HashSet<>();
|
||||
for (WmsCheckTaskCoilRelation relation : coilRelations) {
|
||||
coilIdSet.add(relation.getCoilId());
|
||||
}
|
||||
|
||||
// 查询钢卷基础信息
|
||||
List<WmsMaterialCoilVo> coilList = queryCoilsByIds(coilIdSet);
|
||||
vo.setCoilList(coilList);
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsCheckTask> buildQueryWrapper(WmsCheckTaskBo bo) {
|
||||
@@ -201,6 +290,22 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
|
||||
}
|
||||
}
|
||||
|
||||
// 处理钢卷关联关系
|
||||
if (StringUtils.isNotBlank(bo.getCoilIds())) {
|
||||
String[] coilIds = bo.getCoilIds().split(",");
|
||||
for (String coilId : coilIds) {
|
||||
if (StringUtils.isNotBlank(coilId)) {
|
||||
WmsCheckTaskCoilRelation relation = new WmsCheckTaskCoilRelation();
|
||||
relation.setTaskId(add.getTaskId());
|
||||
relation.setCoilId(coilId.trim());
|
||||
int insertCount = wmsCheckTaskCoilRelationMapper.insert(relation);
|
||||
if (insertCount <= 0) {
|
||||
throw new RuntimeException("新增检查任务钢卷关联失败,钢卷ID:" + coilId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (mainFlag) {
|
||||
bo.setTaskId(add.getTaskId());
|
||||
}
|
||||
@@ -228,10 +333,15 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
|
||||
* 批量删除检查任务
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
|
||||
// 删除检查任务前,先删除相关的钢卷关联记录
|
||||
wmsCheckTaskCoilRelationMapper.deleteByTaskIds(ids);
|
||||
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
<?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.WmsCheckTaskCoilRelationMapper">
|
||||
|
||||
<resultMap type="com.klp.mes.qc.domain.WmsCheckTaskCoilRelation" id="WmsCheckTaskCoilRelationResult">
|
||||
<result property="relationId" column="relation_id"/>
|
||||
<result property="taskId" column="task_id"/>
|
||||
<result property="coilId" column="coil_id"/>
|
||||
<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"/>
|
||||
</resultMap>
|
||||
|
||||
<delete id="deleteByTaskIds" parameterType="java.util.Collection">
|
||||
UPDATE wms_check_task_coil_relation SET del_flag = 1
|
||||
WHERE task_id IN
|
||||
<foreach collection="list" item="taskId" open="(" close=")" separator=",">
|
||||
#{taskId}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user