MOM系统-9-24 加班

XiaoRuby

2023-09-24 208bb2f289ce8a7b59f587a9f57e24c0fc8a0ba6

MOM系统-9-24 加班

 inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java

@@ -3,18 +3,13 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.Opinion;
import com.yuanchu.mom.service.OpinionService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.utils.MyUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.yuanchu.mom.service.InspectUnacceptedService;

@@ -37,9 +32,6 @@

    @Autowired
    private Jwt jwt;

    @Autowired
    private OpinionService opinionService;

    @ApiOperation(value = "不合格品管理列表", tags = "QMS管理-->不合格品管理")
    @ApiImplicitParams(value = {
@@ -131,25 +123,6 @@
        return Result.success(map);
    }

    @ApiOperation(value = "编辑意见-->确定按钮", tags = "QMS管理-->不合格品处置")
    @PostMapping("/addOpinion")
    public Result<?> updateOpinion(@RequestHeader("token") String token, @RequestBody Map<String, Object> opinion) throws Exception {
        List<?> opinion1 = JackSonUtil.unmarshal(JackSonUtil.marshal(opinion.get("opinion")), List.class);
        Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
        String id = data.get("id").replaceAll("\"", "");
        opinionService.updateOpinion(id, opinion1);
        return Result.success("添加成功！");
    }

    @ApiOperation(value = "查看编辑意见", tags = "QMS管理-->不合格品处置")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "rawUnacceptedId", value = "不合格品处置Id", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/viewEditorial")
    public Result<?> viewEditorialComments(Integer rawUnacceptedId) {
        return Result.success(opinionService.viewEditorialComments(rawUnacceptedId));
    }

    @ApiOperation(value = "失焦更新现像描述", tags = "QMS管理-->不合格品处置")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "rawUnacceptedId", value = "不合格品处置Id", dataTypeClass = Integer.class, required = true),
@@ -164,13 +137,20 @@
        return Result.fail("更新失败");
    }

    @ApiOperation(value = "点击编辑意见触发查询", tags = "QMS管理-->不合格品处置")
    @ApiOperation(value = "编辑处置意见确定按钮", tags = "QMS管理-->不合格品处置")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "rawUnacceptedId", value = "不合格品处置Id", dataTypeClass = Integer.class, required = true)
            @ApiImplicitParam(name = "rawUnacceptedId", value = "不合格品处置Id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "opinionTell", value = "处置意见", dataTypeClass = String.class, required = true),
            @ApiImplicitParam(name = "way", value = "处理方式", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "type", value = "不合格类型", dataTypeClass = Integer.class, required = true),
    })
    @GetMapping("/clickEditing")
    public Result<?> clickEditingTriggerQuery(@RequestParam("rawUnacceptedId") Integer rawUnacceptedId) {
        return Result.success(opinionService.clickEditingTriggerQuery(rawUnacceptedId));
    @PostMapping("/editDisposalOpinion")
    public Result<?> editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type) {
        Integer isUpdateSuccess = inspectUnacceptedService.editDisposalOpinionConfirmation(rawUnacceptedId, opinionTell, way, type);
        if (isUpdateSuccess == 1) {
            return Result.success("编辑成功");
        }
        return Result.fail("编辑失败");
    }
}


 inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java

@@ -26,7 +26,4 @@

    //根据检验单id查询成品检验单详情
    List<Map<String, Object>> selectFinishInspectsListById(Integer id);

    //清空检验状态
    void updById(Integer rawInspectId);
}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.InspectUnaccepted;
import com.yuanchu.mom.pojo.vo.RawInspectVo;

import java.util.Map;

/**
@@ -21,5 +23,7 @@
    IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus);

    IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, Integer productCategories, Integer state);

    RawInspectVo editDisposalOpinionConfirmation(Integer rawUnacceptedId);
}


 inspect-server/src/main/java/com/yuanchu/mom/mapper/OpinionMapper.java

ÎļþÒÑɾ³ý

 inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessInspectMapper.java

@@ -24,8 +24,5 @@

    //分页查询过程检验单列表
    IPage<Map<String, Object>> selectProcessInspectsList(Page<Object> page, String techfather, Integer result, String name);

    //将检验状态修改为null
    void updById(Integer rawInspectId);
}


 inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yuanchu.mom.mybatis_config.MyBaseMapper;
import com.yuanchu.mom.pojo.RawInsProduct;

import java.util.List;
@@ -13,7 +14,7 @@
 * @author zss
 * @since 2023-08-01 13:52:30
 */
public interface RawInsProductMapper extends BaseMapper<RawInsProduct> {
public interface RawInsProductMapper extends MyBaseMapper<RawInsProduct> {


    //根据原材料检验单id查询检验项目

 inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java

@@ -28,11 +28,6 @@

    //根据原材料检验单id查看详情
    Map<String, Object> selectRawInspectsListById(Integer id);

    //清空检验结论
    void updById(Integer rawInspectId);


}



 inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java

@@ -57,9 +57,22 @@
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date dealTime;

    /**
     * çŽ°è±¡æè¿°
     **/
    private String tell;

    @ApiModelProperty(value = "处理方式 1：返工返修；2：让步接收；3：接收；4：降级使用；5：报废;6:退货 7:换货")
    private Integer way;

    @ApiModelProperty(value = "处理意见")
    private String opinionTell;

    @ApiModelProperty(value = "瑕疵品 1:瑕疵品；其他：空")
    private Integer faultyMaterials;

    @ApiModelProperty(value = "逻辑删除 æ­£å¸¸>=1,删除<=0", hidden = true)
    private Integer state;


    @TableField(fill = FieldFill.INSERT)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -75,12 +88,5 @@
     * å…³è” æ£€éªŒå•id
     **/
    private Integer rawInspectId;



    /**
     * çŽ°è±¡æè¿°
     **/
    private String tell;
}


 inspect-server/src/main/java/com/yuanchu/mom/pojo/Opinion.java

ÎļþÒÑɾ³ý

 inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java

@@ -78,6 +78,4 @@
    /* æ£€éªŒé¡¹ç›® */
    @JsonSerialize
    private List<RawInsProductVo> rawInsProducts;


}

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

@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.InspectUnaccepted;
import com.yuanchu.mom.vo.Result;
import org.springframework.transaction.annotation.Transactional;

import java.util.Map;

@@ -56,5 +56,8 @@

    //评审
    Integer rawEvaluate(Integer rawId, Integer passOrNo);

    @Transactional(rollbackFor = Exception.class)
    Integer editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type);
}


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

ÎļþÒÑɾ³ý

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.RawInsProduct;
import com.yuanchu.mom.pojo.vo.RawInsProductVo;

import java.util.List;
import java.util.Map;
@@ -28,5 +29,7 @@
     * @param devId
     */
    void updateDevByRpId(Integer rpId, Integer devId);

    void batchAddInsProduct(Integer id, List<RawInsProductVo> rawInsProducts);
}


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

@@ -19,10 +19,10 @@

    /**
     * æ–°å¢žåŽŸææ–™æ£€éªŒå•
     * @param userId
     * @param userName
     * @param rawInspectVo
     */
    String addRawInspects(String userId, RawInspectVo rawInspectVo);
    String addRawInspects(String userName, RawInspectVo rawInspectVo);

    /**
     * åˆ†é¡µæŸ¥è¯¢åŽŸææ–™æ£€éªŒå•åˆ—表

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

@@ -6,17 +6,16 @@
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 com.yuanchu.mom.pojo.RawInspect;
import com.yuanchu.mom.pojo.vo.RawInspectVo;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.MyUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

/**
@@ -31,8 +30,21 @@
    @Resource
    InspectUnacceptedMapper inspectUnacceptedMapper;

    @Resource
    OpinionService opinionService;
    // åŽŸææ–™æ£€éªŒ
    @Autowired
    private RawInspectService rawInspectService;

    // // åŽŸææ–™æ£€éªŒå­æ•°æ®
    @Autowired
    private RawInsProductService rawInsProductService;

    // åŠæˆå“æ£€éªŒ
    @Autowired
    private FinishedInspectService finishedInspectService;

    // åœ¨åˆ¶å“æ£€éªŒ
    @Autowired
    private ProcessInspectService processInspectService;

    //查询成品不合格品检验单列表
    @Override
@@ -64,16 +76,37 @@
        LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
                .eq(InspectUnaccepted::getId, rawId)
                .set(InspectUnaccepted::getDealReasult, passOrNo);
        //如果是评审不通过则新增不合格处理意见表
        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);
        return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
            }
            opinionService.saveBatch(opinions);

    @Override
    public Integer editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type) {
        LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
                .eq(InspectUnaccepted::getId, rawUnacceptedId)
                .set(InspectUnaccepted::getWay, way)
                .set(InspectUnaccepted::getOpinionTell, opinionTell);
        if (way == 1){
            // ç­‰äºŽ0：原材料
            if (type == 0){
                // æ ¹æ®Id查询原材料检验信息信息
                RawInspectVo map = inspectUnacceptedMapper.editDisposalOpinionConfirmation(rawUnacceptedId);
                RawInspect rawInspect = new RawInspect();
                BeanUtils.copyProperties(map, rawInspect);
                // ä¿å­˜çˆ¶çº§
                rawInspectService.save(rawInspect);
                // æ‰¹é‡ä¿å­˜å­çº§
                rawInsProductService.batchAddInsProduct(rawInspect.getId(), map.getRawInsProducts());
            }
            // ç­‰äºŽ1：半成品
            else if (type == 1) {
                // TODO è¯¥æŽ¥å£åªå‰©ä½™è¿™ä¸¤å¤„
            }
            // ç­‰äºŽ2：在制品
            else if (type == 2) {
                // TODO è¯¥æŽ¥å£åªå‰©ä½™è¿™ä¸¤å¤„
            }
        } else if (way == 2 || way == 3 || way == 4){
            updateWrapper.set(InspectUnaccepted::getFaultyMaterials, 1);
        }
        return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
    }

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

ÎļþÒÑɾ³ý

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

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


import ch.qos.logback.core.joran.util.beans.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,16 +9,15 @@
import com.yuanchu.mom.mapper.RawInspectMapper;
import com.yuanchu.mom.pojo.RawInsProduct;
import com.yuanchu.mom.pojo.RawInspect;
import com.yuanchu.mom.pojo.vo.RawInsProductVo;
import com.yuanchu.mom.service.RawInsProductService;
import com.yuanchu.mom.utils.MyUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

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

/**
@@ -88,6 +88,19 @@
        rawInsProductMapper.update(new RawInsProduct(), updateWrapper);
    }

    @Override
    public void batchAddInsProduct(Integer id, List<RawInsProductVo> rawInsProducts) {
        List<RawInsProduct> rawInsProductList = new ArrayList<>();
        rawInsProducts.forEach(i -> {
            RawInsProduct rawInsProduct1 = new RawInsProduct();
            BeanUtils.copyProperties(i, rawInsProduct1);
            rawInsProduct1.setRawInspectId(id);
            rawInsProduct1.setState(1);
            rawInsProductList.add(rawInsProduct1);
        });
        rawInsProductMapper.insertBatchSomeColumn(rawInsProductList);
    }

    /*判断检测值是否满足标准值和内控值的要求,如果不满足则检验结论为不合格*/
    //如果是±的操作
    private int conValues(String standardValueStr, String controlValueStr, String detectionValueStr) {

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

@@ -136,6 +136,7 @@
            InspectUnaccepted rawUnaccepted = InspectUnaccepted.builder()
                    .reason(rawInspectMapper.selectById(id).getName() + "不合格")  //暂且定义为原材料不合格
                    .rawInspectId(id)
                    .dealReasult(1)
                    .type(0)        //类型为原材料
                    .build();
            inspectUnacceptedMapper.insert(rawUnaccepted);

 inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml

@@ -1,12 +1,6 @@
<?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.FinishedInspectMapper">
    <!--清空检验状态-->
    <update id="updById">
        update mom_ocean.finished_inspect
        set result=null
        where id = #{rawInspectId}
    </update>
    <select id="selectFinishedInspectPage" resultType="map">
        SELECT f.`id`,
        f.`order_number`,

 inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml

@@ -88,7 +88,7 @@
    <!--不合格处置-->
    <select id="selectDisposal" resultType="map">
        SELECT i.`id`, s.`type`, s.name productName, s.`specifications`, s.number, i.`tell` description,
        i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`
        i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`, i.way, i.faulty_materials, i.opinion_tell
        FROM mom_ocean.inspect_unaccepted i
        LEFT JOIN
        (
@@ -103,7 +103,7 @@
            productName != null and productName != ''">AND r.`name` LIKE CONCAT('%', #{productName}, '%')
            </if>
            UNION ALL
            -- æˆå“
            -- åŠæˆå“
            SELECT 1 AS `type`, f.`project_name` `name`, f.`specifications_model` specifications, f.`quantity` `number`, f.`id`, u.name user_name
            FROM mom_ocean.finished_inspect f, mom_ocean.`user` u
            WHERE f.`state` = 1
@@ -115,7 +115,7 @@
                AND f.`project_name` LIKE CONCAT('%', #{productName}, '%')
            </if>
            UNION ALL
            -- åŠæˆå“
            -- åœ¨åˆ¶å“
            SELECT 2 AS `type`, p.`material` `name`, p.`specifications_model` specifications, p.`quantity` `number`, p.`id`, u.name user_name
            FROM mom_ocean.process_inspect p, mom_ocean.`user` u
            WHERE p.state = 1
@@ -137,4 +137,32 @@
        </if>
        ORDER BY i.`update_time` DESC
    </select>

    <resultMap id="editDisposalOpinionConfirmationMap" type="com.yuanchu.mom.pojo.vo.RawInspectVo">
        <id property="code" column="code"/>
        <result property="unit" column="unit"/>
        <result property="name" column="name"/>
        <result property="specifications" column="specifications"/>
        <result property="formTime" column="form_time"/>
        <result property="number" column="number"/>
        <result property="supplier" column="supplier"/>
        <result property="userName" column="user_name"/>
        <collection property="rawInsProducts" ofType="com.yuanchu.mom.pojo.vo.RawInsProductVo">
            <result property="name" column="pNmae"/>
            <result property="unit" column="pUnit"/>
            <result property="required" column="required"/>
            <result property="deviceId" column="device_id"/>
            <result property="internal" column="internal"/>
            <result property="testValue" column="test_value"/>
        </collection>
    </resultMap>

    <select id="editDisposalOpinionConfirmation" resultMap="editDisposalOpinionConfirmationMap">
        select r.`form_time`, r.`specifications`, r.`code`, r.`name`, r.`unit`, r.`number`, r.`supplier`, r.`user_name`, p.`name` pNmae, p.`unit` pUnit,
               p.`required`,p.`internal`, p.`test_value`, p.`device_id`
        from (mom_ocean.inspect_unaccepted i, mom_ocean.raw_inspect r)
                 left join mom_ocean.raw_ins_product p on r.`id` = p.`raw_inspect_id`
        where i.`id` = #{rawUnacceptedId}
          and i.`raw_inspect_id` = r.`id`
    </select>
</mapper>

 inspect-server/src/main/resources/mapper/OpinionMapper.xml

ÎļþÒÑɾ³ý

 inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml

@@ -2,10 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.ProcessInspectMapper">

    <!--将检验状态修改为null-->
    <update id="updById">
        update mom_ocean.process_inspect set result=null where id=#{rawInspectId}
    </update>
    <!--新增过程检验单-根据订单号选择产品信息和工艺-->
    <resultMap id="oneMap" type="map">
        <id property="name" column="material"/>

 inspect-server/src/main/resources/mapper/RawInspectMapper.xml

@@ -3,14 +3,6 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.RawInspectMapper">
    <!--清空原材料检验结论-->
    <update id="updById">
        update mom_ocean.raw_inspect
        set ins_state=0,
            ins_time=null,
            judge_state=null
        where id = #{rawInspectId}
    </update>
    <select id="selCountRaw" resultType="java.lang.Integer">
        select count(id)
        from mom_ocean.raw_inspect