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

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-02-03 09:50:13 +08:00
parent 7943318f26 50122bc6e9
commit 98ee1ba4e3
8 changed files with 410 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
klp-wms/src/main/java/com/klp/controller/WmsCheckTaskCoilRelationController.java Normal file
View File

@@ -0,0 +1,99 @@
package com.klp.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.domain.vo.WmsCheckTaskCoilRelationVo;
import com.klp.domain.bo.WmsCheckTaskCoilRelationBo;
import com.klp.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));
}
}

41
klp-wms/src/main/java/com/klp/domain/WmsCheckTaskCoilRelation.java Normal file
View File

@@ -0,0 +1,41 @@
package com.klp.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;
}

36
klp-wms/src/main/java/com/klp/domain/bo/WmsCheckTaskCoilRelationBo.java Normal file
View File

@@ -0,0 +1,36 @@
package com.klp.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
/**
* 检查任务与钢卷关联业务对象 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;
}

41
klp-wms/src/main/java/com/klp/domain/vo/WmsCheckTaskCoilRelationVo.java Normal file
View File

@@ -0,0 +1,41 @@
package com.klp.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;
/**
* 检查任务与钢卷关联视图对象 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;
}

15
klp-wms/src/main/java/com/klp/mapper/WmsCheckTaskCoilRelationMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.klp.mapper;
import com.klp.domain.WmsCheckTaskCoilRelation;
import com.klp.domain.vo.WmsCheckTaskCoilRelationVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 检查任务与钢卷关联Mapper接口
*
* @author klp
* @date 2026-02-03
*/
public interface WmsCheckTaskCoilRelationMapper extends BaseMapperPlus<WmsCheckTaskCoilRelationMapper, WmsCheckTaskCoilRelation, WmsCheckTaskCoilRelationVo> {
}

49
klp-wms/src/main/java/com/klp/service/IWmsCheckTaskCoilRelationService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.klp.service;
import com.klp.domain.WmsCheckTaskCoilRelation;
import com.klp.domain.vo.WmsCheckTaskCoilRelationVo;
import com.klp.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);
}

110
klp-wms/src/main/java/com/klp/service/impl/WmsCheckTaskCoilRelationServiceImpl.java Normal file
View File

@@ -0,0 +1,110 @@
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.WmsCheckTaskCoilRelationBo;
import com.klp.domain.vo.WmsCheckTaskCoilRelationVo;
import com.klp.domain.WmsCheckTaskCoilRelation;
import com.klp.mapper.WmsCheckTaskCoilRelationMapper;
import com.klp.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;
}
}

19
klp-wms/src/main/resources/mapper/klp/WmsCheckTaskCoilRelationMapper.xml Normal file
View File

@@ -0,0 +1,19 @@
<?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.mapper.WmsCheckTaskCoilRelationMapper">
<resultMap type="com.klp.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>
</mapper>