base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
base-server/src/main/java/com/yuanchu/mom/mapper/TechniqueModelMapper.java
@@ -34,5 +34,11 @@ //根据工艺路线id批量删除 void delAllByTechId(String ids); //根据技术指标id批量删除 void delTechById(Integer id); //根据技术指标id批量删除 void delAllTech(String ids); }
@@ -2,11 +2,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.mom.mapper.TechnicalModelMapper; import com.yuanchu.mom.mapper.TechniqueModelMapper; import com.yuanchu.mom.pojo.TechnicalModel; import com.yuanchu.mom.pojo.dto.TechnicalModelDto; import com.yuanchu.mom.service.TechnicalModelService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @@ -23,6 +25,9 @@ @Resource TechnicalModelMapper technicalModelMapper; @Resource TechniqueModelMapper techniqueModelMapper; //查询技术指标维护列表-->左边二级展示工序和工艺 @Override @@ -78,17 +83,23 @@ //删除 @Override @Transactional(rollbackFor = Exception.class) public void delTechById(Integer id) { //删除技术指标 TechnicalModel technicalModel = new TechnicalModel(); technicalModel.setState(0); technicalModel.setId(id); technicalModelMapper.updateById(technicalModel); //删除生产工艺 techniqueModelMapper.delTechById(id); } //批量删除 @Override @Transactional(rollbackFor = Exception.class) public void delAllTech(String ids) { technicalModelMapper.delAllTech(ids); techniqueModelMapper.delAllTech(ids); } }
@@ -8,7 +8,7 @@ WHERE d.state = 1 AND d.type = #{type} <if test="search_class !=null and search_class != ''"> AND d.`name` like concat('%',#{search_class},'%') AND d.`father` like concat('%',#{search_class},'%') </if> </select> <!--查询设备维护 右侧列表展示该设备组下的所有设备--> @@ -30,7 +30,7 @@ </if> <if test="message!=null and message!=''"> and code like concat('%',#{message},'%') or device.name like concat('%',#{message},'%') and device.name like concat('%',#{message},'%') </if> </select> <!--根据设备分组查询设备--> base-server/src/main/resources/mapper/TechniqueModelMapper.xml
@@ -12,6 +12,18 @@ <result property="unit" column="unit"/> <result property="name" column="name"/> </resultMap> <!--根据技术指标id批量删除--> <update id="delTechById"> update mom_ocean.technique_model set state=0 where technical_model_id = #{id} </update> <!--根据技术指标id批量删除--> <update id="delAllTech"> update mom_ocean.technique_model set state=0 where technical_model_id in (${id}) </update> <select id="selectAllTeque" resultMap="selectAllTequeMap"> select d.name dname, qm.id, inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
@@ -93,6 +93,9 @@ }) @PostMapping("/evaluatePassOrNo") public Result<?> rawEvaluate(Integer rawId, Integer passOrNo){ if (inspectUnacceptedService.getById(rawId).getDealState() == 1) { return Result.fail("已经评审过了不能再次评审!"); } Integer integer = inspectUnacceptedService.rawEvaluate(rawId, passOrNo); if (integer >= 1) { return Result.success("评审成功！"); inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
@@ -54,6 +54,7 @@ */ Integer descriptionUpdate(Integer rawUnacceptedId, String tell); //评审 Integer rawEvaluate(Integer rawId, Integer passOrNo); }
@@ -6,12 +6,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.mom.mapper.InspectUnacceptedMapper; import com.yuanchu.mom.mapper.OpinionMapper; import com.yuanchu.mom.pojo.InspectUnaccepted; import com.yuanchu.mom.pojo.Opinion; import com.yuanchu.mom.service.InspectUnacceptedService; import com.yuanchu.mom.service.OpinionService; import com.yuanchu.mom.vo.Result; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; /** @@ -25,6 +30,9 @@ @Resource InspectUnacceptedMapper inspectUnacceptedMapper; @Resource OpinionService opinionService; //查询成品不合格品检验单列表 @Override @@ -50,12 +58,24 @@ return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper); } //评审 @Override public Integer rawEvaluate(Integer rawId, Integer passOrNo) { LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate() .eq(InspectUnaccepted::getId, rawId) .set(InspectUnaccepted::getDealReasult, passOrNo) .set(InspectUnaccepted::getDealState, passOrNo); .set(InspectUnaccepted::getDealState, 1); //如果是评审不通过则新增不合格处理意见表 if (passOrNo==0) { List<Opinion> opinions = new ArrayList<>(); for (int i = 0; i <= 3; i++) { Opinion opinion = new Opinion(); opinion.setType(i); opinion.setRawUnacceptedId(rawId); opinions.add(opinion); } opinionService.saveBatch(opinions); } return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper); } } inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java
@@ -35,8 +35,6 @@ @Resource private OpinionMapper opinionMapper; @Resource private InspectUnacceptedService inspectUnacceptedService; @Override public List<UpdateInspectUnacceptedDto> clickEditingTriggerQuery(Integer rawUnacceptedId) { @@ -68,7 +66,6 @@ throw new RuntimeException(e); } }); MyUtil.PrintLog(list.get(1).getRawUnacceptedId().toString()); return opinionMapper.updateOpinion(list); }
@@ -46,5 +46,11 @@ //根据id查看详情 List<Map<String, Object>> selTeqById(Integer id); //根据技术指标id删除 void delByProId(Integer id); //根据技术指标id批量删除 void delAll(String ids); }
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.mom.mapper.TechniqueMapper; import com.yuanchu.mom.mapper.TechnologyMapper; import com.yuanchu.mom.pojo.Product; import com.yuanchu.mom.pojo.dto.ProductDto; @@ -9,6 +10,8 @@ import com.yuanchu.mom.mapper.ProductMapper; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; import java.util.Map; @@ -26,6 +29,9 @@ @Resource TechnologyMapper technologyMapper; @Resource TechniqueMapper techniqueMapper; //根据型号id查询项目(技术指标) @Override @@ -102,17 +108,25 @@ //删除 @Override @Transactional(rollbackFor = Exception.class) public void delProById(Integer id) { //删除技术指标 Product product = new Product(); product.setId(id); product.setState(0); productMapper.updateById(product); //删除生产工艺 techniqueMapper.delByProId(id); } //批量删除 @Override @Transactional(rollbackFor = Exception.class) public void delAllPro(String ids) { //批量删除技术指标 productMapper.delAllPro(ids); //删除生产工艺 techniqueMapper.delAll(ids); } //查询标准BOM技术指标中该型号工艺下最新版本的检验项目 standard-server/src/main/resources/mapper/TechniqueMapper.xml
@@ -1,6 +1,22 @@ <?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.yuanchu.mom.mapper.TechniqueMapper"> <!--根据技术指标id删除--> <update id="delByProId"> update mom_ocean.technique set state=0 where technology_id = (select technology_id from mom_ocean.product where product.id = #{id}) and product_father = (select father from mom_ocean.product where product.id = #{id}) and product = (select name from mom_ocean.product where product.id = #{id}) </update> <!--根据技术指标id批量删除--> <update id="delAll"> update mom_ocean.technique set state=0 where technology_id in (select technology_id from mom_ocean.product where product.id in (${ids})) and product_father in (select father from mom_ocean.product where product.id in (${ids})) and product in (select name from mom_ocean.product where product.id in (${ids})) </update> <!--根据型号id查询所有版本--> <select id="selectVerByTeq" resultType="java.lang.Integer"> select distinct version
