update add工位关联物料类型

master
yinq 1 month ago
parent f53e48c04d
commit e420eea507

@ -0,0 +1,46 @@
package org.dromara.mes.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import java.util.Date;
/**
* prod_base_station_materialtype
*
* @author Yinq
* @date 2025-05-13
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("prod_base_station_materialtype")
public class ProdBaseStationMaterialtype extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
private Long stationId;
/**
* ID
*/
private Long materialTypeId;
/**
* (1 0)
*/
private String activeFlag;
@TableField(exist = false)
private Long updateBy;
@TableField(exist = false)
private Date updateTime;
}

@ -8,6 +8,9 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.mes.domain.ProdBaseStationMaterialtype;
import java.util.List;
/**
* prod_base_station_info
@ -75,4 +78,6 @@ public class ProdBaseStationInfoBo extends BaseEntity {
private String remark;
private Long machineId;
private List<ProdBaseStationMaterialtype> prodBaseStationMaterialtypeList;
}

@ -0,0 +1,42 @@
package org.dromara.mes.domain.bo;
import org.dromara.mes.domain.ProdBaseStationMaterialtype;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/**
* prod_base_station_materialtype
*
* @author Yinq
* @date 2025-05-13
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = ProdBaseStationMaterialtype.class, reverseConvertGenerate = false)
public class ProdBaseStationMaterialtypeBo extends BaseEntity {
/**
* ID
*/
@NotNull(message = "工位ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long stationId;
/**
* ID
*/
@NotNull(message = "物料类型ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long materialTypeId;
/**
* (1 0)
*/
@NotBlank(message = "激活标识(1是 0否)不能为空", groups = { AddGroup.class, EditGroup.class })
private String activeFlag;
}

@ -7,10 +7,12 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.mes.domain.ProdBaseStationMaterialtype;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@ -138,4 +140,6 @@ public class ProdBaseStationInfoVo implements Serializable {
*/
@ExcelProperty(value = "机台名称")
private String machineName;
private List<ProdBaseStationMaterialtype> prodBaseStationMaterialtypeList;
}

@ -0,0 +1,51 @@
package org.dromara.mes.domain.vo;
import org.dromara.mes.domain.ProdBaseStationMaterialtype;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* prod_base_station_materialtype
*
* @author Yinq
* @date 2025-05-13
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = ProdBaseStationMaterialtype.class)
public class ProdBaseStationMaterialtypeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
@ExcelProperty(value = "工位ID")
private Long stationId;
/**
* ID
*/
@ExcelProperty(value = "物料类型ID")
private Long materialTypeId;
/**
* (1 0)
*/
@ExcelProperty(value = "激活标识(1是 0否)", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "active_flag")
private String activeFlag;
}

@ -0,0 +1,15 @@
package org.dromara.mes.mapper;
import org.dromara.mes.domain.ProdBaseStationMaterialtype;
import org.dromara.mes.domain.vo.ProdBaseStationMaterialtypeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* Mapper
*
* @author Yinq
* @date 2025-05-13
*/
public interface ProdBaseStationMaterialtypeMapper extends BaseMapperPlus<ProdBaseStationMaterialtype, ProdBaseStationMaterialtypeVo> {
}

@ -0,0 +1,69 @@
package org.dromara.mes.service;
import org.dromara.mes.domain.ProdBaseStationMaterialtype;
import org.dromara.mes.domain.vo.ProdBaseStationMaterialtypeVo;
import org.dromara.mes.domain.bo.ProdBaseStationMaterialtypeBo;
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-05-13
*/
public interface IProdBaseStationMaterialtypeService {
/**
*
*
* @param stationId
* @return
*/
ProdBaseStationMaterialtypeVo queryById(Long stationId);
/**
*
*
* @param bo
* @param pageQuery
* @return
*/
TableDataInfo<ProdBaseStationMaterialtypeVo> queryPageList(ProdBaseStationMaterialtypeBo bo, PageQuery pageQuery);
/**
*
*
* @param bo
* @return
*/
List<ProdBaseStationMaterialtypeVo> queryList(ProdBaseStationMaterialtypeBo bo);
/**
*
*
* @param bo
* @return
*/
Boolean insertByBo(ProdBaseStationMaterialtypeBo bo);
/**
*
*
* @param bo
* @return
*/
Boolean updateByBo(ProdBaseStationMaterialtypeBo bo);
/**
*
*
* @param ids
* @param isValid
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

@ -1,5 +1,6 @@
package org.dromara.mes.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -9,12 +10,11 @@ import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.mes.domain.ProdBaseMachineInfo;
import org.dromara.mes.domain.ProdBaseProcessInfo;
import org.dromara.mes.domain.*;
import org.dromara.mes.mapper.ProdBaseStationMaterialtypeMapper;
import org.springframework.stereotype.Service;
import org.dromara.mes.domain.bo.ProdBaseStationInfoBo;
import org.dromara.mes.domain.vo.ProdBaseStationInfoVo;
import org.dromara.mes.domain.ProdBaseStationInfo;
import org.dromara.mes.mapper.ProdBaseStationInfoMapper;
import org.dromara.mes.service.IProdBaseStationInfoService;
@ -34,6 +34,9 @@ public class ProdBaseStationInfoServiceImpl implements IProdBaseStationInfoServi
private final ProdBaseStationInfoMapper baseMapper;
private final ProdBaseStationMaterialtypeMapper stationMaterialtypeMapper;
/**
*
*
@ -42,7 +45,18 @@ public class ProdBaseStationInfoServiceImpl implements IProdBaseStationInfoServi
*/
@Override
public ProdBaseStationInfoVo queryById(Long stationId) {
return baseMapper.selectVoById(stationId);
ProdBaseStationInfoBo bo = new ProdBaseStationInfoBo();
bo.setStationId(stationId);
MPJLambdaWrapper<ProdBaseStationInfo> lqw = buildQueryWrapper(bo);
ProdBaseStationInfoVo prodBaseStationInfoVo = baseMapper.selectVoOne(lqw);
//机台关联工序
MPJLambdaWrapper<ProdBaseStationMaterialtype> lqwRelation = JoinWrappers.lambda(ProdBaseStationMaterialtype.class)
.selectAll(ProdBaseStationMaterialtype.class)
.eq(bo.getStationId() != null, ProdBaseStationMaterialtype::getStationId, bo.getStationId())
.orderByAsc(ProdBaseStationMaterialtype::getCreateTime);
List<ProdBaseStationMaterialtype> prodBaseStationMaterialtypeList = stationMaterialtypeMapper.selectList(lqwRelation);
prodBaseStationInfoVo.setProdBaseStationMaterialtypeList(prodBaseStationMaterialtypeList);
return prodBaseStationInfoVo;
}
/**
@ -119,6 +133,15 @@ public class ProdBaseStationInfoServiceImpl implements IProdBaseStationInfoServi
public Boolean updateByBo(ProdBaseStationInfoBo bo) {
ProdBaseStationInfo update = MapstructUtils.convert(bo, ProdBaseStationInfo.class);
validEntityBeforeSave(update);
List<ProdBaseStationMaterialtype> prodBaseStationMaterialtypeList = bo.getProdBaseStationMaterialtypeList();
if (!prodBaseStationMaterialtypeList.isEmpty()) {
LambdaQueryWrapper<ProdBaseStationMaterialtype> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotNull(bo.getStationId()), ProdBaseStationMaterialtype::getStationId, bo.getStationId());
stationMaterialtypeMapper.delete(lqw);
for (ProdBaseStationMaterialtype stationMaterialType : prodBaseStationMaterialtypeList) {
stationMaterialtypeMapper.insert(stationMaterialType);
}
}
return baseMapper.updateById(update) > 0;
}

@ -0,0 +1,134 @@
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 com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.dromara.mes.domain.bo.ProdBaseStationMaterialtypeBo;
import org.dromara.mes.domain.vo.ProdBaseStationMaterialtypeVo;
import org.dromara.mes.domain.ProdBaseStationMaterialtype;
import org.dromara.mes.mapper.ProdBaseStationMaterialtypeMapper;
import org.dromara.mes.service.IProdBaseStationMaterialtypeService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* Service
*
* @author Yinq
* @date 2025-05-13
*/
@RequiredArgsConstructor
@Service
public class ProdBaseStationMaterialtypeServiceImpl implements IProdBaseStationMaterialtypeService {
private final ProdBaseStationMaterialtypeMapper baseMapper;
/**
*
*
* @param stationId
* @return
*/
@Override
public ProdBaseStationMaterialtypeVo queryById(Long stationId){
return baseMapper.selectVoById(stationId);
}
/**
*
*
* @param bo
* @param pageQuery
* @return
*/
@Override
public TableDataInfo<ProdBaseStationMaterialtypeVo> queryPageList(ProdBaseStationMaterialtypeBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<ProdBaseStationMaterialtype> lqw = buildQueryWrapper(bo);
Page<ProdBaseStationMaterialtypeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
*
*
* @param bo
* @return
*/
@Override
public List<ProdBaseStationMaterialtypeVo> queryList(ProdBaseStationMaterialtypeBo bo) {
MPJLambdaWrapper<ProdBaseStationMaterialtype> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<ProdBaseStationMaterialtype> buildQueryWrapper(ProdBaseStationMaterialtypeBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<ProdBaseStationMaterialtype> lqw = JoinWrappers.lambda(ProdBaseStationMaterialtype.class)
.selectAll(ProdBaseStationMaterialtype.class)
.eq(bo.getStationId() != null, ProdBaseStationMaterialtype::getStationId, bo.getStationId())
.eq(bo.getMaterialTypeId() != null, ProdBaseStationMaterialtype::getMaterialTypeId, bo.getMaterialTypeId())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdBaseStationMaterialtype::getActiveFlag, bo.getActiveFlag())
.orderByDesc(ProdBaseStationMaterialtype::getCreateTime);
return lqw;
}
/**
*
*
* @param bo
* @return
*/
@Override
public Boolean insertByBo(ProdBaseStationMaterialtypeBo bo) {
ProdBaseStationMaterialtype add = MapstructUtils.convert(bo, ProdBaseStationMaterialtype.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setStationId(add.getStationId());
}
return flag;
}
/**
*
*
* @param bo
* @return
*/
@Override
public Boolean updateByBo(ProdBaseStationMaterialtypeBo bo) {
ProdBaseStationMaterialtype update = MapstructUtils.convert(bo, ProdBaseStationMaterialtype.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
*
*/
private void validEntityBeforeSave(ProdBaseStationMaterialtype 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,7 @@
<?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.ProdBaseStationMaterialtypeMapper">
</mapper>
Loading…
Cancel
Save