修改 9.12

zss

2023-09-12 cbf4b74927fe51c19c307d89b326ae999cb6a165

修改   9.12

 base-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -67,9 +67,12 @@
    }

    @ApiOperation(value = "新增仪器设备：设备组下拉框")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "type", value = "设备用途", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/list_group")
    public Result<?> listGroup() {
        return Result.success(deviceService.listGroup());
    public Result<?> listGroup(Integer type) {
        return Result.success(deviceService.listGroup(type));
    }

    @ApiOperation(value = "新增仪器设备")

 base-server/src/main/java/com/yuanchu/mom/controller/SelfcheckModelController.java

@@ -46,8 +46,7 @@
    @ApiOperation(value = "新增自检项目维护")
    @PostMapping("/addSelfcheck")
    public Result addSelfcheck(@Validated @RequestBody SelfcheckModelDto selfcheckModelDto) {
        Integer id = selfcheckModelService.addSelfcheck(selfcheckModelDto);
        return Result.success("新增自建项目"+id+"成功!");
        return Result.success(selfcheckModelService.addSelfcheck(selfcheckModelDto));
    }

    @ApiOperation(value = "删除")

 base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java

@@ -35,6 +35,6 @@
    List<Map<String, Object>> chooseDevice();

    //新增--选择设备组
    List<String> listGroup();
    List<String> listGroup(Integer type);

}

 base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java

@@ -76,5 +76,5 @@
     * 新增仪器设备：设备组下拉框
     * @return
     */
    List<String> listGroup();
    List<String> listGroup(Integer type);
}

 base-server/src/main/java/com/yuanchu/mom/service/SelfcheckModelService.java

@@ -27,7 +27,7 @@
     * @param selfcheckModelDto
     * @return
     */
    Integer addSelfcheck(SelfcheckModelDto selfcheckModelDto);
    String addSelfcheck(SelfcheckModelDto selfcheckModelDto);

    /**
     * 删除

 base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

@@ -86,7 +86,7 @@

    //新增仪器设备：设备组下拉框
    @Override
    public List<String> listGroup() {
        return deviceMapper.listGroup();
    public List<String> listGroup(Integer type) {
        return deviceMapper.listGroup(type);
    }
}

 base-server/src/main/java/com/yuanchu/mom/service/impl/SelfcheckModelServiceImpl.java

@@ -31,16 +31,26 @@

    //新增自检项目
    @Override
    public Integer addSelfcheck(SelfcheckModelDto selfcheckModelDto) {
    public String addSelfcheck(SelfcheckModelDto selfcheckModelDto) {
        String required = selfcheckModelDto.getRequired();
        String internal = selfcheckModelDto.getInternal();
        char requ = required.charAt(0);
        if (requ != '>' && requ != '<' && requ != '=') {
            return "标准值输入格式有问题!";
        }
        char inter = internal.charAt(0);
        if (inter != '>' && inter != '<' && inter != '=') {
            return "内控值输入格式有问题!";
        }
        SelfcheckModel selfcheckModel = SelfcheckModel.builder()
                .name(selfcheckModelDto.getName())
                .techTemId(selfcheckModelDto.getTechTemId())
                .unit(selfcheckModelDto.getUnit())
                .required(selfcheckModelDto.getRequired())
                .internal(selfcheckModelDto.getInternal())
                .required(required)
                .internal(internal)
                .build();
        selfcheckModelMapper.insert(selfcheckModel);
        return selfcheckModel.getId();
        return "新增"+selfcheckModel.getId()+"成功";
    }

    //删除

 base-server/src/main/resources/mapper/DeviceMapper.xml

@@ -70,6 +70,7 @@
        select distinct father
        from mom_ocean.device
        where state = 1
          and type = #{type}
    </select>
    <!--批量删除-->
    <update id="delAllDevice">

 base-server/src/main/resources/mapper/TechniqueModelMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="com.yuanchu.mom.mapper.TechniqueModelMapper">
    <!--查询生产工艺维护列表 右边展示该工艺下能使用的设备所能做的项目-->
    <resultMap id="selectAllTequeMap" type="map">
        <id property="name" column="dname"/>
        <id property="dname" column="dname"/>
        <collection property="children" resultMap="selectAllTequeMaps" javaType="List"/>
    </resultMap>
    <resultMap id="selectAllTequeMaps" type="map">
@@ -67,6 +67,8 @@
        select tt.type,
               tt.father techFather,
               tt.name   techName,
               tt.id     tid,
               d.id      did,
               d.name    dname,
               cm.father,
               cm.name,

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java

@@ -81,6 +81,7 @@
        } else {
            inspectionItem.setResult(1);
        }
        inspectionItem.setUsername(username);
        inspectionItemMapper.updateById(inspectionItem);
        //返回检验项目的结论
        return inspectionItem.getResult();

 standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java

@@ -39,12 +39,9 @@


    @ApiOperation("右上角新增-->物料清单")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "technologyId", value = "工艺路线id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/add")
    public Result<?> addMbom(Integer technologyId, @Validated @RequestBody MbomDto mbomDto) {
        mbomService.addMbom(technologyId, mbomDto);
    public Result<?> addMbom(@Validated @RequestBody MbomDto mbomDto) {
        mbomService.addMbom( mbomDto);
        return Result.success("添加物料清单【" + mbomDto.getName() + "】成功");
    }


 standard-server/src/main/java/com/yuanchu/mom/controller/ProductController.java

@@ -40,12 +40,9 @@
    }

    @ApiOperation("右上角新增-->技术指标")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "technologyId", value = "工艺路线id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/add")
    public Result<?> addProduct(Integer technologyId, @Validated @RequestBody ProductDto productDto) {
        productService.addProduct(technologyId, productDto);
    public Result<?> addProduct(@Validated @RequestBody ProductDto productDto) {
        productService.addProduct(productDto);
        return Result.success("添加技术指标【" + productDto.getName() + "】成功");
    }


 standard-server/src/main/java/com/yuanchu/mom/controller/TechniqueController.java

@@ -56,12 +56,9 @@
    }

    @ApiOperation("右上角新增-->生产工艺")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "technologyId", value = "工艺路线id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/add")
    public Result<?> addTechnique(Integer technologyId, @Validated @RequestBody TechniqueDto techniqueDto) {
        techniqueService.addTechnique(technologyId, techniqueDto);
    public Result<?> addTechnique(@Validated @RequestBody TechniqueDto techniqueDto) {
        techniqueService.addTechnique(techniqueDto);
        return Result.success("添加生产工艺成功");
    }


 standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyController.java

@@ -45,12 +45,9 @@
    }

    @ApiOperation("右上角新增-->工艺路线")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "specificationsId", value = "型号id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/add")
    public Result<?> addTechnology(Integer specificationsId, @Validated @RequestBody TechnologyDto technologyDto) {
        technologyService.addTechnology(specificationsId, technologyDto);
    public Result<?> addTechnology(@Validated @RequestBody TechnologyDto technologyDto) {
        technologyService.addTechnology(technologyDto);
        return Result.success("添加工艺【" + technologyDto.getName() + "】成功");
    }


 standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MbomDto.java

@@ -3,11 +3,15 @@
import lombok.Data;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

@Data
//右上角新增参数
public class MbomDto {

    @NotNull(message = "工艺路线id不能为空")
    private Integer technologyId;

    /**
     * 原材料名称
     **/

 standard-server/src/main/java/com/yuanchu/mom/pojo/dto/ProductDto.java

@@ -3,28 +3,32 @@
import lombok.Data;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;

@Data
//右上角新增参数
public class ProductDto {

    @NotNull(message = "工艺路线id不能为空")
    private Integer technologyId;

    /**
     * 项目名称
     */
    @NotBlank(message = "工艺名称不能为空!")
    @NotBlank(message = "项目名称不能为空!")
    private String name;

    /**
     * 项目父类
     */
    @NotBlank(message = "工艺名称不能为空!")
    @NotBlank(message = "项目父类不能为空!")
    private String father;

    /**
     * 单位
     */
    @NotBlank(message = "工艺名称不能为空!")
    @NotBlank(message = "单位不能为空!")
    private String unit;

    /**

 standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechniqueDto.java

@@ -3,11 +3,15 @@
import lombok.Data;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

@Data
//右上角新增参数
public class TechniqueDto {

    @NotNull(message = "工艺路线id不能为空")
    private Integer technologyId;

    /**
     * 设备名称
     **/

 standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyDto.java

@@ -2,13 +2,18 @@


import lombok.Data;
import org.apache.ibatis.annotations.Param;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

@Data
//右上角新增参数
public class TechnologyDto {

    @NotNull(message = "型号id不能为空!")
    private Integer specificationsId;

    //工艺名称
    @NotBlank(message = "工艺名称不能为空!")
    private String name;

 standard-server/src/main/java/com/yuanchu/mom/service/MbomService.java

@@ -39,10 +39,9 @@

    /**
     * 右上角新增-->物料清单
     * @param technologyId
     * @param mbomDto
     */
    void addMbom(Integer technologyId, MbomDto mbomDto);
    void addMbom( MbomDto mbomDto);

    /**
     * 填写数量,鼠标移开保存

 standard-server/src/main/java/com/yuanchu/mom/service/ProductService.java

@@ -52,10 +52,9 @@

    /**
     * 右上角新增-->技术指标
     * @param technologyId
     * @param productDto
     */
    void addProduct(Integer technologyId, ProductDto productDto);
    String addProduct(ProductDto productDto);

    /**
     * 填写标准值与内控值,鼠标移开保存

 standard-server/src/main/java/com/yuanchu/mom/service/TechniqueService.java

@@ -53,10 +53,9 @@

    /**
     * 右上角新增-->生产工艺
     * @param technologyId
     * @param techniqueDto
     */
    void addTechnique(Integer technologyId, TechniqueDto techniqueDto);
    void addTechnique(TechniqueDto techniqueDto);

    /**
     * 删除

 standard-server/src/main/java/com/yuanchu/mom/service/TechnologyService.java

@@ -45,10 +45,9 @@

    /**
     * 右上角新增-->工艺路线
     * @param specificationsId
     * @param technologyDto
     */
    void addTechnology(Integer specificationsId, TechnologyDto technologyDto);
    void addTechnology(TechnologyDto technologyDto);

    /**
     * 填写生产定额,鼠标移开保存

 standard-server/src/main/java/com/yuanchu/mom/service/impl/MbomServiceImpl.java

@@ -48,10 +48,9 @@

    //右上角新增-->物料清单
    @Override
    public void addMbom(Integer technologyId, MbomDto mbomDto) {
    public void addMbom(MbomDto mbomDto) {
        Mbom mbom = new Mbom();
        BeanUtils.copyProperties(mbomDto, mbom);
        mbom.setTechnologyId(technologyId);
        mbomMapper.insert(mbom);
    }


 standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java

@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.TechnologyMapper;
import com.yuanchu.mom.pojo.Product;
@@ -58,11 +59,25 @@

    //右上角新增-->技术指标
    @Override
    public void addProduct(Integer technologyId, ProductDto productDto) {
    public String addProduct(ProductDto productDto) {
        Product product = new Product();
        String required = productDto.getRequired();
        String internal = productDto.getInternal();
        if (ObjectUtils.isNotEmpty(required)){
            char requ = required.charAt(0);
            if (requ != '>' && requ != '<' && requ != '=') {
                return "标准值输入格式有问题!";
            }
        }
        if (ObjectUtils.isNotEmpty(internal)){
            char inter = internal.charAt(0);
            if (inter != '>' && inter != '<' && inter != '=') {
                return "内控值输入格式有问题!";
            }
        }
        BeanUtils.copyProperties(productDto, product);
        product.setTechnologyId(technologyId);
        productMapper.insert(product);
        return "新增成功!";
    }

    //填写标准值与内控值,鼠标移开保存

 standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java

@@ -60,10 +60,9 @@

    //右上角新增-->生产工艺
    @Override
    public void addTechnique(Integer technologyId, TechniqueDto techniqueDto) {
    public void addTechnique(TechniqueDto techniqueDto) {
        Technique technique = new Technique();
        BeanUtils.copyProperties(techniqueDto, technique);
        technique.setTechnologyId(technologyId);
        techniqueMapper.insert(technique);
    }


 standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java

@@ -71,11 +71,9 @@

    //右上角新增-->工艺路线
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void addTechnology(Integer specificationsId, TechnologyDto technologyDto) {
    public void addTechnology(TechnologyDto technologyDto) {
        Technology technology = new Technology();
        BeanUtils.copyProperties(technologyDto, technology);
        technology.setSpecificationsId(specificationsId);
        technologyMapper.insert(technology);
    }


 standard-server/src/main/resources/mapper/TechniqueMapper.xml

@@ -23,9 +23,15 @@
        <collection property="children" resultMap="threeMap" javaType="List"/>
    </resultMap>
    <resultMap id="threeMap" type="map">
        <id property="tqid" column="tqid"/>
        <result property="device" column="device"/>
        <collection property="children" resultMap="fourMap" javaType="List"/>
    </resultMap>
    <resultMap id="fourMap" type="map">
        <result property="productFather" column="product_father"/>
        <collection property="children" resultMap="fiveMap" javaType="List"/>
    </resultMap>
    <resultMap id="fiveMap" type="map">
        <id property="tqid" column="tqid"/>
        <result property="product" column="product"/>
        <result property="unit" column="unit"/>
    </resultMap>