修改 9.15

zss

2023-09-15 cd5b5908546c3d6c98e7aec607af8db1f8565495

修改   9.15

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

@@ -52,11 +52,6 @@
        return Result.success(technologyTemplateService.chooseTech(type));
    }

    @ApiOperation(value = "新增工艺路线维护-->选择元件")
    @GetMapping("/chooseElement")
    public Result chooseElement() {
        return Result.success(technologyTemplateService.chooseElement());
    }

    @ApiOperation(value = "新增工艺路线维护")
    @PostMapping("/addTechTemp")
@@ -80,7 +75,7 @@
            @ApiImplicitParam(name = "father", value = "工序(父类)", dataTypeClass = String.class, required = true)
    })
    @GetMapping("/selectAllTechNam")
    public Result selectAllTechNam(String father) {
    public Result selectAllTechNam(String father,Integer id) {
        return Result.success(technologyTemplateService.selectAllTechNam(father));
    }


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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -19,10 +19,10 @@
    //新增工艺路线-->选择工序
    List<String> chooseTech(Integer type);

    //查询工艺路线列表-->左边二级展示
    //查询工艺路线列表-->左边一级展示
    List<Map<String,Object>> selectAllTechTem(Integer type,String message);

    //查询工艺路线列表-->右边展示工艺和设备
    //查询工艺路线列表-->右边展示工艺和设备和元件
    List<Map<String, Object>> selectAllTechNam(String father);

    /**
@@ -32,13 +32,8 @@
     */
    List<Map<String, Object>> selecTechById(Integer id);


    //批量删除
    void delAllTech(String ids);





}


 base-server/src/main/java/com/yuanchu/mom/pojo/Element.java

ÎļþÒÑɾ³ý

 base-server/src/main/java/com/yuanchu/mom/pojo/ElementTechnology.java

ÎļþÒÑɾ³ý

 base-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java

@@ -67,5 +67,10 @@
     * è®¾å¤‡ç»„
     **/
    private String deviceGroup;

    /**
     * å…ƒä»¶
     **/
    private String element;
}


 base-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java

@@ -23,8 +23,8 @@
    private String name;

    @JsonSerialize
    @NotBlank(message = "元件id不能为空")
    private String elementId;
    @NotBlank(message = "元件不能为空")
    private String element;

    @JsonSerialize
    @NotBlank(message = "设备组不能为空")

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -30,12 +30,6 @@
    List<String> chooseTech(Integer type);

    /**
     * æ–°å¢žå·¥è‰ºè·¯çº¿-->选择元件
     * @return
     */
    List<Map<String,Object>> chooseElement();

    /**
     * æ–°å¢žå·¥è‰ºè·¯çº¿
     * @param technologyTemplateDto
     */

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -1,25 +1,17 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.ElementTechnology;
import com.yuanchu.mom.pojo.TechnologyTemplate;
import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
import com.yuanchu.mom.service.ElementTechnologyService;
import com.yuanchu.mom.service.TechnologyTemplateService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * å·¥è‰ºè·¯çº¿ç»´æŠ¤è¡¨(TechnologyTemplate)表服务实现类
@@ -35,12 +27,6 @@

    @Resource
    DeviceMapper deviceMapper;

    @Resource
    ElementMapper elementMapper;

    @Resource
    ElementTechnologyService elementTechnologyService;

    @Resource
    TechnicalModelMapper technicalModelMapper;
@@ -70,11 +56,6 @@
        return technologyTemplateMapper.chooseTech(type);
    }

    //新增工艺路线-->选择元件
    @Override
    public List<Map<String, Object>> chooseElement() {
        return elementMapper.chooseElement();
    }

    //新增工艺路线
    @Override
@@ -84,24 +65,15 @@
        TechnologyTemplate technologyTemplate = new TechnologyTemplate();
        BeanUtils.copyProperties(technologyTemplateDto, technologyTemplate);
        technologyTemplateMapper.insert(technologyTemplate);
        /*新增工艺元件中间表*/
        String[] split = technologyTemplateDto.getElementId().split(",");
        List<ElementTechnology> elementTechnologies = Arrays.stream(split).map(s -> {
            ElementTechnology elementTechnology = new ElementTechnology();
            elementTechnology.setTechTemId(technologyTemplate.getId());
            elementTechnology.setElementId(Integer.parseInt(s));
            return elementTechnology;
        }).collect(Collectors.toList());
        elementTechnologyService.saveBatch(elementTechnologies);
    }

    //查询工艺路线列表-->左边二级展示
    //查询工艺路线列表-->左边一级展示
    @Override
    public List<Map<String, Object>> selectAllTechTem(Integer type, String message) {
        return technologyTemplateMapper.selectAllTechTem(type, message);
    }

    //查询工艺路线列表-->右边展示工艺和设备
    //查询工艺路线列表-->右边展示工艺和设备和元件
    @Override
    public List<Map<String, Object>> selectAllTechNam(String father) {
        return technologyTemplateMapper.selectAllTechNam(father);
@@ -122,18 +94,6 @@
        BeanUtils.copyProperties(technologyTemplateDto, technologyTemplate);
        technologyTemplate.setId(id);
        technologyTemplateMapper.updateById(technologyTemplate);
        /*更改中间表*/
        //批量删除原有的中间表(根据工序id)
        elementTechnologyService.delElemaByTechsId(id);
        //批量添加中间表
        String[] split = technologyTemplateDto.getElementId().split(",");
        List<ElementTechnology> elementTechnologies = Arrays.stream(split).map(s -> {
            ElementTechnology elementTechnology = new ElementTechnology();
            elementTechnology.setTechTemId(technologyTemplate.getId());
            elementTechnology.setElementId(Integer.parseInt(s));
            return elementTechnology;
        }).collect(Collectors.toList());
        elementTechnologyService.saveBatch(elementTechnologies);
    }

    //删除(工艺路线id)
@@ -144,8 +104,6 @@
        TechnologyTemplate technologyTemplate = new TechnologyTemplate();
        technologyTemplate.setId(id).setState(0);
        technologyTemplateMapper.updateById(technologyTemplate);
        //删除中间表
        elementTechnologyService.delElemaByTechsId(id);
        //删除技术指标维护表
        technicalModelMapper.delTeMoByTechId(id);
        //删除生产工艺维护表
@@ -164,8 +122,6 @@
    public void delAllTech(String ids) {
        //批量删除工艺表
        technologyTemplateMapper.delAllTech(ids);
        //批量删除中间表
        elementTechnologyService.delAllByTechId(ids);
        //批量删除指标维护表
        technicalModelMapper.delAllByTechId(ids);
        //批量删除生产工艺维护表

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -35,6 +35,7 @@
             mom_ocean.device d,
             mom_ocean.technology_template tt
        where qm.state = 1
          and d.state = 1
          and d.id = qm.device_id
          and cm.id = qm.technical_model_id
          and tt.id = qm.tech_tem_id

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

@@ -8,23 +8,11 @@
    </update>

    <!--查询工艺路线列表  å·¦è¾¹äºŒçº§å±•ç¤º-->
    <resultMap id="selectAllTechTemMap" type="map">
        <id property="name" column="elname"/>
        <collection property="children" resultMap="selectAllTechTemTowMap" javaType="List"/>
    </resultMap>
    <resultMap id="selectAllTechTemTowMap" type="map">
        <result property="name" column="father"/>
    </resultMap>
    <select id="selectAllTechTem" resultMap="selectAllTechTemMap">
        select e.name elname,
    <select id="selectAllTechTem" resultType="java.util.Map">
        select distinct
        father
        from mom_ocean.technology_template t,
        mom_ocean.element e,
        mom_ocean.element_technology et
        where e.id = et.element_id
        and t.id = tech_tem_id
        and t.state = 1
        and et.state=1
        from mom_ocean.technology_template t
        where t.state = 1
        and type=#{type}
        <if test="message!=null and message!=''">
            and father like concat('%',#{message},'%')
@@ -35,6 +23,7 @@
    <select id="selectAllTechNam" resultType="java.util.Map">
        select id,
               name,
               element,
               device_group
        from mom_ocean.technology_template
        where state = 1
@@ -50,28 +39,8 @@
    </select>

    <!--根据id查看详情-->
    <resultMap id="selecTechByIdMap" type="map">
        <id property="type" column="type"/>
        <result property="father" column="father"/>
        <result property="name" column="name"/>
        <result property="deviceGroup" column="device_group"/>
        <collection property="children" resultMap="selecTechByIdsMap" javaType="List"/>
    </resultMap>
    <resultMap id="selecTechByIdsMap" type="map">
        <id property="id" column="id"/>
    </resultMap>
    <select id="selecTechById" resultMap="selecTechByIdMap">
        select e.id,
               father,
               t.name,
               type,
               device_group
        from mom_ocean.technology_template t,
             mom_ocean.element e,
             mom_ocean.element_technology et
        where e.id = et.element_id
          and t.id = tech_tem_id
          and t.state = 1
          and t.id = #{id}
    <select id="selecTechById" resultType="java.util.Map">
        select * from mom_ocean.technology_template where state=1
    </select>

</mapper>

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

@@ -90,6 +90,7 @@
        List<InspectionItem> inspectionItemList = productList.stream().map(product -> {
            InspectionItem inspectionItem = new InspectionItem();
            BeanUtils.copyProperties(product, inspectionItem);
            inspectionItem.setId(null);
            inspectionItem.setCreateTime(new Date());
            inspectionItem.setUpdateTime(new Date());
            inspectionItem.setInspectId(finishedInspect.getId());

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

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

import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.mapper.InspectionItemMapper;
import com.yuanchu.mom.mapper.TechniqueMapper;
import com.yuanchu.mom.pojo.InspectionItem;
@@ -55,13 +57,13 @@
    //更改设备
    @Override
    public void updateDevByInsId(Integer id, Integer type, Integer devId) {
        InspectionItem inspectionItem = new InspectionItem();
        inspectionItem.setId(id);
        inspectionItem.setType(type);
        inspectionItem.setDeviceId(devId);
        inspectionItem.setInspectionValue(null);
        inspectionItem.setResult(null);
        inspectionItemMapper.updateById(inspectionItem);
        LambdaUpdateWrapper<InspectionItem> updateWrapper = Wrappers.<InspectionItem>lambdaUpdate()
                .eq(InspectionItem::getId, id)
                .eq(InspectionItem::getType, type)
                .set(InspectionItem::getDeviceId, devId)
                .set(InspectionItem::getInspectionValue, null)
                .set(InspectionItem::getResult, null);
        inspectionItemMapper.update(new InspectionItem(), updateWrapper);
    }

    //新增按钮-->2、检验项目-->失去焦点发起该请求

 inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java

@@ -98,8 +98,7 @@
    public Result updateSaleById(@RequestHeader("token") String token, Integer id, String str) throws Exception {
        SaleVo saleVo = JackSonUtil.unmarshal(str, SaleVo.class);
        Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
        saleService.updateSaleById(data.get("name").replaceAll("\"", ""), id, saleVo);
        return Result.success("修改成功!");
        return Result.success(saleService.updateSaleById(data.get("name").replaceAll("\"", ""), id, saleVo));
    }

    @ApiOperation(value = "根据销售单id删除")

 inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java

@@ -63,7 +63,7 @@
     * @param saleman
     * @param saleVo
     */
    void updateSaleById(String saleman,Integer id, SaleVo saleVo);
    String updateSaleById(String saleman,Integer id, SaleVo saleVo);

    /**
     * å®¡æ ¸

 inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java

@@ -14,14 +14,13 @@
import com.yuanchu.mom.pojo.vo.SaleVo;
import com.yuanchu.mom.service.SaleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.vo.Result;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -109,7 +108,19 @@
    //根据销售单id修改信息
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateSaleById(String saleman, Integer id, SaleVo saleVo) {
    public String updateSaleById(String saleman, Integer id, SaleVo saleVo) {
        //校验,同一个产品的规格型号不能相同
        List<SaleMaterialDto> saleMaterialList = saleVo.getSaleMaterialList();
        // ä½¿ç”¨å“ˆå¸Œé›†åˆæ¥åˆ¤æ–­æ˜¯å¦å­˜åœ¨ç›¸åŒå­—段值组合
        Set<String> seen = new HashSet<>();
        for (SaleMaterialDto saleMaterial: saleMaterialList) {
            String key = saleMaterial.getName() + "," + saleMaterial.getSpecifications();
            if (seen.contains(key)) {
                return "同一个产品的规格型号不能相同";
            } else {
                seen.add(key);
            }
        }
        Sale sale = saleMapper.selectById(id);
        sale.setSaleman(saleman);
        BeanUtils.copyProperties(saleVo, sale);
@@ -121,6 +132,7 @@
            BeanUtils.copyProperties(saleMaterialDto, saleMaterial);
            saleMaterialMapper.updateById(saleMaterial);
        }
        return "修改成功!";
    }

    //审核