update 添加模具换模计划
yinq
5 days ago
parent
8723f50a96
commit
21d58ed15b
@ -0,0 +1,116 @@
|
||||
package org.dromara.mes.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.*;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.mes.domain.vo.ProdMouldChangePlanVo;
|
||||
import org.dromara.mes.domain.bo.ProdMouldChangePlanBo;
|
||||
import org.dromara.mes.service.IProdMouldChangePlanService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 模具换模计划
|
||||
* 前端访问路由地址为:/mes/mouldChangePlan
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-02-20
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/mouldChangePlan")
|
||||
public class ProdMouldChangePlanController extends BaseController {
|
||||
|
||||
private final IProdMouldChangePlanService prodMouldChangePlanService;
|
||||
|
||||
/**
|
||||
* 查询模具换模计划列表
|
||||
*/
|
||||
@SaCheckPermission("mes:mouldChangePlan:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ProdMouldChangePlanVo> list(ProdMouldChangePlanBo bo, PageQuery pageQuery) {
|
||||
return prodMouldChangePlanService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出模具换模计划列表
|
||||
*/
|
||||
@SaCheckPermission("mes:mouldChangePlan:export")
|
||||
@Log(title = "模具换模计划", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(ProdMouldChangePlanBo bo, HttpServletResponse response) {
|
||||
List<ProdMouldChangePlanVo> list = prodMouldChangePlanService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "模具换模计划", ProdMouldChangePlanVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取模具换模计划详细信息
|
||||
*
|
||||
* @param mouldChangePlanId 主键
|
||||
*/
|
||||
@SaCheckPermission("mes:mouldChangePlan:query")
|
||||
@GetMapping("/{mouldChangePlanId}")
|
||||
public R<ProdMouldChangePlanVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long mouldChangePlanId) {
|
||||
return R.ok(prodMouldChangePlanService.queryById(mouldChangePlanId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增模具换模计划
|
||||
*/
|
||||
@SaCheckPermission("mes:mouldChangePlan:add")
|
||||
@Log(title = "模具换模计划", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdMouldChangePlanBo bo) {
|
||||
return toAjax(prodMouldChangePlanService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改模具换模计划
|
||||
*/
|
||||
@SaCheckPermission("mes:mouldChangePlan:edit")
|
||||
@Log(title = "模具换模计划", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdMouldChangePlanBo bo) {
|
||||
return toAjax(prodMouldChangePlanService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除模具换模计划
|
||||
*
|
||||
* @param mouldChangePlanIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("mes:mouldChangePlan:remove")
|
||||
@Log(title = "模具换模计划", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{mouldChangePlanIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] mouldChangePlanIds) {
|
||||
return toAjax(prodMouldChangePlanService.deleteWithValidByIds(List.of(mouldChangePlanIds), true));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 下拉框查询模具换模计划列表
|
||||
*/
|
||||
@GetMapping("/getProdMouldChangePlanList")
|
||||
public R<List<ProdMouldChangePlanVo>> getProdMouldChangePlanList(ProdMouldChangePlanBo bo) {
|
||||
List<ProdMouldChangePlanVo> list = prodMouldChangePlanService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package org.dromara.mes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.dromara.mes.domain.ProdMouldChangePlan;
|
||||
import org.dromara.mes.domain.vo.ProdMouldChangePlanVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 模具换模计划Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-02-20
|
||||
*/
|
||||
public interface ProdMouldChangePlanMapper extends BaseMapperPlus<ProdMouldChangePlan, ProdMouldChangePlanVo> {
|
||||
|
||||
|
||||
/**
|
||||
* 模具换模计划列表
|
||||
* @param page
|
||||
* @param queryWrapper
|
||||
* @return
|
||||
*/
|
||||
public Page<ProdMouldChangePlanVo> selectProdMouldChangePlanList(@Param("page") Page<ProdMouldChangePlanVo> page, @Param(Constants.WRAPPER) Wrapper<ProdMouldChangePlan> queryWrapper);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.mes.service;
|
||||
|
||||
import org.dromara.mes.domain.ProdMouldChangePlan;
|
||||
import org.dromara.mes.domain.vo.ProdMouldChangePlanVo;
|
||||
import org.dromara.mes.domain.bo.ProdMouldChangePlanBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 模具换模计划Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-02-20
|
||||
*/
|
||||
public interface IProdMouldChangePlanService {
|
||||
|
||||
/**
|
||||
* 查询模具换模计划
|
||||
*
|
||||
* @param mouldChangePlanId 主键
|
||||
* @return 模具换模计划
|
||||
*/
|
||||
ProdMouldChangePlanVo queryById(Long mouldChangePlanId);
|
||||
|
||||
/**
|
||||
* 分页查询模具换模计划列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 模具换模计划分页列表
|
||||
*/
|
||||
TableDataInfo<ProdMouldChangePlanVo> queryPageList(ProdMouldChangePlanBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的模具换模计划列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 模具换模计划列表
|
||||
*/
|
||||
List<ProdMouldChangePlanVo> queryList(ProdMouldChangePlanBo bo);
|
||||
|
||||
/**
|
||||
* 新增模具换模计划
|
||||
*
|
||||
* @param bo 模具换模计划
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ProdMouldChangePlanBo bo);
|
||||
|
||||
/**
|
||||
* 修改模具换模计划
|
||||
*
|
||||
* @param bo 模具换模计划
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ProdMouldChangePlanBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除模具换模计划信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,141 @@
|
||||
package org.dromara.mes.service.impl;
|
||||
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.mes.domain.BaseMaterialInfo;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.mes.domain.bo.ProdMouldChangePlanBo;
|
||||
import org.dromara.mes.domain.vo.ProdMouldChangePlanVo;
|
||||
import org.dromara.mes.domain.ProdMouldChangePlan;
|
||||
import org.dromara.mes.mapper.ProdMouldChangePlanMapper;
|
||||
import org.dromara.mes.service.IProdMouldChangePlanService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 模具换模计划Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-02-20
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ProdMouldChangePlanServiceImpl implements IProdMouldChangePlanService {
|
||||
|
||||
private final ProdMouldChangePlanMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询模具换模计划
|
||||
*
|
||||
* @param mouldChangePlanId 主键
|
||||
* @return 模具换模计划
|
||||
*/
|
||||
@Override
|
||||
public ProdMouldChangePlanVo queryById(Long mouldChangePlanId) {
|
||||
return baseMapper.selectVoById(mouldChangePlanId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询模具换模计划列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 模具换模计划分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ProdMouldChangePlanVo> queryPageList(ProdMouldChangePlanBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ProdMouldChangePlan> lqw = buildQueryWrapper(bo);
|
||||
Page<ProdMouldChangePlanVo> result = baseMapper.selectProdMouldChangePlanList(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的模具换模计划列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 模具换模计划列表
|
||||
*/
|
||||
@Override
|
||||
public List<ProdMouldChangePlanVo> queryList(ProdMouldChangePlanBo bo) {
|
||||
MPJLambdaWrapper<ProdMouldChangePlan> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ProdMouldChangePlan> buildQueryWrapper(ProdMouldChangePlanBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ProdMouldChangePlan> lqw = JoinWrappers.lambda(ProdMouldChangePlan.class)
|
||||
.selectAll(ProdMouldChangePlan.class)
|
||||
.eq(bo.getMouldChangePlanId() != null, ProdMouldChangePlan::getMouldChangePlanId, bo.getMouldChangePlanId())
|
||||
.eq(bo.getPlanId() != null, ProdMouldChangePlan::getPlanId, bo.getPlanId())
|
||||
.eq(bo.getPlanDate() != null, ProdMouldChangePlan::getPlanDate, bo.getPlanDate())
|
||||
.eq(bo.getShiftId() != null, ProdMouldChangePlan::getShiftId, bo.getShiftId())
|
||||
.eq(bo.getMouldId() != null, ProdMouldChangePlan::getMouldId, bo.getMouldId())
|
||||
.eq(bo.getMaterialId() != null, ProdMouldChangePlan::getMaterialId, bo.getMaterialId())
|
||||
.eq(bo.getMachineId() != null, ProdMouldChangePlan::getMachineId, bo.getMachineId())
|
||||
.eq(StringUtils.isNotBlank(bo.getModelCode()), ProdMouldChangePlan::getModelCode, bo.getModelCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getPlanStatus()), ProdMouldChangePlan::getPlanStatus, bo.getPlanStatus())
|
||||
.like(StringUtils.isNotBlank(bo.getMaterialName()), "bmi", BaseMaterialInfo::getMaterialName, bo.getMaterialName())
|
||||
.orderByAsc(ProdMouldChangePlan::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增模具换模计划
|
||||
*
|
||||
* @param bo 模具换模计划
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ProdMouldChangePlanBo bo) {
|
||||
ProdMouldChangePlan add = MapstructUtils.convert(bo, ProdMouldChangePlan.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setMouldChangePlanId(add.getMouldChangePlanId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改模具换模计划
|
||||
*
|
||||
* @param bo 模具换模计划
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ProdMouldChangePlanBo bo) {
|
||||
ProdMouldChangePlan update = MapstructUtils.convert(bo, ProdMouldChangePlan.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ProdMouldChangePlan entity) {
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除模具换模计划信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if (isValid) {
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
<?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="org.dromara.mes.mapper.ProdMouldChangePlanMapper">
|
||||
|
||||
<resultMap type="ProdMouldChangePlanVo" id="ProdMouldChangePlanResult">
|
||||
<result property="mouldChangePlanId" column="mould_change_plan_id"/>
|
||||
<result property="tenantId" column="tenant_id"/>
|
||||
<result property="planId" column="plan_id"/>
|
||||
<result property="planDate" column="plan_date"/>
|
||||
<result property="shiftId" column="shift_id"/>
|
||||
<result property="mouldId" column="mould_id"/>
|
||||
<result property="materialId" column="material_id"/>
|
||||
<result property="machineId" column="machine_id"/>
|
||||
<result property="modelCode" column="model_code"/>
|
||||
<result property="planStatus" column="plan_status"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="createDept" column="create_dept"/>
|
||||
<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="planCode" column="plan_code"/>
|
||||
<result property="shiftName" column="shift_name"/>
|
||||
<result property="mouldName" column="mould_name"/>
|
||||
<result property="materialName" column="material_name"/>
|
||||
<result property="machineName" column="machine_name"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
<select id="selectProdMouldChangePlanList" parameterType="ProdMouldChangePlanBo"
|
||||
resultMap="ProdMouldChangePlanResult">
|
||||
select
|
||||
<if test="ew.getSqlSelect != null">
|
||||
${ew.getSqlSelect},
|
||||
p4.plan_code,
|
||||
bsi.shift_name,
|
||||
pbmi.mould_name,
|
||||
bmi.material_name,
|
||||
pb.machine_name
|
||||
</if>
|
||||
<if test="ew.getSqlSelect == null">
|
||||
*
|
||||
</if>
|
||||
from prod_mould_change_plan t
|
||||
left join prod_plan_info_4 p4 on p4.plan_id = t.plan_id
|
||||
left join base_shift_info bsi on bsi.shift_id = t.shift_id
|
||||
left join prod_base_mould_info pbmi on pbmi.mould_id = t.mould_id
|
||||
left join base_material_info bmi on bmi.material_id = t.material_id
|
||||
left join prod_base_machine_info pb on pb.machine_id = t.machine_id
|
||||
${ew.getCustomSqlSegment}
|
||||
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue