Merge remote-tracking branch 'origin/master'

zss

2023-09-11 9a16d4675b22d0845158d0f07424f4bda2e39475

Merge remote-tracking branch 'origin/master'

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

@@ -28,7 +28,6 @@
 * @author zss
 * @since 2023-08-07 10:04:01
 */
@Api(tags = "QMS管理-->不合格品管理")
@RestController
@RequestMapping("/inspectUnaccepted")
public class InspectUnacceptedController {
@@ -42,16 +41,17 @@
    @Autowired
    private OpinionService opinionService;

    @ApiOperation(value = "查询成品不合格品检验单列表", tags = "QMS管理-->不合格品管理")
    @ApiOperation(value = "不合格品管理列表", tags = "QMS管理-->不合格品管理")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize",value = "页数",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "countSize",value = "条数/页",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "formTime",value = "来料日期",dataTypeClass  = String.class),
            @ApiImplicitParam(name = "dealState",value = "处理状态(为空=全部)",dataTypeClass  = Integer.class)
            @ApiImplicitParam(name = "dealState",value = "处理状态(为空=全部)",dataTypeClass  = Integer.class),
            @ApiImplicitParam(name = "productCategories",value = "产品大类",dataTypeClass  = Integer.class),
    })
    @GetMapping("/selectUnRawInspectsList")
    public Result<?> selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState){
        IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime,dealState);
    public Result<?> selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState, Integer productCategories){
        IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime,dealState, productCategories);
        Map<String, Object> map = new HashMap<>();
        map.put("total", inspectionPage.getTotal());
        map.put("row", inspectionPage.getRecords());
@@ -86,6 +86,20 @@
        return Result.success(map);
    }

    @ApiOperation(value = "评审", tags = "QMS管理-->原材料不合格品")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "rawId",value = "原材料Id",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "passOrNo",value = "是否通过：0：不通过；1：通过",dataTypeClass  = Integer.class,required = true)
    })
    @PostMapping("/evaluatePassOrNo")
    public Result<?> rawEvaluate(Integer rawId, Integer passOrNo){
        Integer integer = inspectUnacceptedService.rawEvaluate(rawId, passOrNo);
        if (integer >= 1) {
            return Result.success("评审成功！");
        }
        return Result.fail("评审失败！");
    }

    @ApiOperation(value = "不合格品分页列表", tags = "QMS管理-->不合格品处置")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize",value = "页数",dataTypeClass  = Integer.class,required = true),

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

@@ -39,7 +39,7 @@
    @PostMapping("/addRawInspects")
    public Result addRawInspects(@RequestHeader("token") String token,@Validated @RequestBody RawInspectVo rawInspectVo) throws Exception {
        Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
        return Result.success(rawInspectService.addRawInspects(data.get("id").replaceAll("\"", ""), rawInspectVo));
        return Result.success("提交成功！",rawInspectService.addRawInspects(data.get("id").replaceAll("\"", ""), rawInspectVo));
    }

    @ApiOperation(value = "分页查询原材料检验单列表")

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

@@ -16,9 +16,7 @@


    //查询成品检验中不合格品检验单列表
    IPage<Map<String, Object>> selectInsList(Page<Object> page, String formTime, Integer dealState);


    IPage<Map<String, Object>> selectInsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories);

    IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus);


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

@@ -4,6 +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 java.util.Map;

@@ -22,7 +23,7 @@
     * @param dealState
     * @return
     */
    IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState);
    IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories);

    /**
     * 查询原材料不合格品检验单列表
@@ -52,5 +53,7 @@
     * @return
     */
    Integer descriptionUpdate(Integer rawUnacceptedId, String tell);

    Integer rawEvaluate(Integer rawId, Integer passOrNo);
}


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

@@ -8,6 +8,7 @@
import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
import com.yuanchu.mom.pojo.InspectUnaccepted;
import com.yuanchu.mom.service.InspectUnacceptedService;
import com.yuanchu.mom.vo.Result;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -27,8 +28,8 @@

    //查询成品不合格品检验单列表
    @Override
    public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState) {
        return inspectUnacceptedMapper.selectInsList(page, formTime, dealState);
    public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories) {
        return inspectUnacceptedMapper.selectInsList(page, formTime, dealState, productCategories);
    }

    @Override
@@ -48,5 +49,13 @@
                .set(InspectUnaccepted::getTell, tell);
        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);
        return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
    }
}

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

@@ -8,6 +8,7 @@
import com.yuanchu.mom.pojo.Opinion;
import com.yuanchu.mom.mapper.OpinionMapper;
import com.yuanchu.mom.pojo.dto.UpdateInspectUnacceptedDto;
import com.yuanchu.mom.service.InspectUnacceptedService;
import com.yuanchu.mom.service.OpinionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -33,6 +34,9 @@

    @Resource
    private OpinionMapper opinionMapper;

    @Resource
    private InspectUnacceptedService inspectUnacceptedService;

    @Override
    public List<UpdateInspectUnacceptedDto> clickEditingTriggerQuery(Integer rawUnacceptedId) {
@@ -64,6 +68,7 @@
                throw new RuntimeException(e);
            }
        });
        MyUtil.PrintLog(list.get(1).getRawUnacceptedId().toString());
        return opinionMapper.updateOpinion(list);
    }


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

@@ -1,15 +1,19 @@
package com.yuanchu.mom.service.impl;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.RawInsProductMapper;
import com.yuanchu.mom.mapper.RawInspectMapper;
import com.yuanchu.mom.pojo.RawInsProduct;
import com.yuanchu.mom.pojo.RawInspect;
import com.yuanchu.mom.service.RawInsProductService;
import com.yuanchu.mom.utils.MyUtil;
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;
@@ -64,12 +68,12 @@
    //只更改设备,之前的检验值删掉
    @Override
    public void updateDevByRpId(Integer rpId, Integer devId) {
        RawInsProduct rawInsProduct = new RawInsProduct();
        rawInsProduct.setId(rpId);
        rawInsProduct.setDeviceId(devId);
        rawInsProduct.setTestValue(null);
        rawInsProduct.setTestState(null);
        rawInsProductMapper.updateById(rawInsProduct);
        LambdaUpdateWrapper<RawInsProduct> updateWrapper = Wrappers.<RawInsProduct>lambdaUpdate()
                .eq(RawInsProduct::getId, rpId)
                .set(RawInsProduct::getDeviceId, devId)
                .set(RawInsProduct::getTestState, null)
                .set(RawInsProduct::getTestValue, null);
        rawInsProductMapper.update(new RawInsProduct(), updateWrapper);
    }

    /*判断检测值是否满足标准值和内控值的要求,如果不满足则检验结论为不合格*/

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

@@ -93,7 +93,7 @@
        }).collect(Collectors.toList());
        //检验项目批量添加
        rawInsProductService.saveBatch(rawInsProductList);
        return "新增检验单成功!";
        return rawInspect.getId().toString();
    }



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

@@ -6,36 +6,51 @@
    <!--不合格管理-->
    <select id="selectInsList" resultType="java.util.Map">
        SELECT ru.id,
        DATE_FORMAT(fi.create_time, '%Y-%m-%d') dateArrival,
        reason,
        material_code,
        project_name,
        ru.reason,
        u.`name`,
        specifications_model,
        unit,
        quantity,
        DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,
        u.name,
        deal_state,
        deal_reasult,
        DATE_FORMAT(fi.update_time, '%Y-%m-%d') processingDate
        FROM (inspect_unaccepted ru,
        `user` u)
        LEFT JOIN finished_inspect fi ON fi.`id` = ru.`raw_inspect_id`
        where fi.id = ru.raw_inspect_id
        AND ru.type = 1
        ru.deal_state,
        ru.deal_reasult,
        DATE_FORMAT(fi.dateArrival, '%Y-%m-%d') dateArrival,
        fi.material_code,
        fi.project_name,
        fi.specifications_model,
        fi.unit,
        fi.quantity,
        DATE_FORMAT(fi.inspectionDate, '%Y-%m-%d') inspectionDate,
        DATE_FORMAT(fi.processingDate, '%Y-%m-%d') processingDate
        FROM mom_ocean.inspect_unaccepted ru, mom_ocean.`user` u, (
        SELECT p.id, DATE_FORMAT(p.`create_time`, '%Y-%m-%d') dateArrival, p.`material_code`, p.`material` project_name,
        p.`specifications_model`,
        p.`unit`, p.`quantity`,DATE_FORMAT(p.`create_time`, '%Y-%m-%d') inspectionDate, DATE_FORMAT(p.`update_time`,
        '%Y-%m-%d') processingDate, p.`user_id`, 2 AS
        classify
        FROM mom_ocean.process_inspect p
        WHERE p.`state` = 1
        UNION ALL
        SELECT fi.id, DATE_FORMAT(fi.create_time, '%Y-%m-%d')
        dateArrival,material_code,project_name,specifications_model,
        unit,quantity,DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,DATE_FORMAT(fi.update_time, '%Y-%m-%d')
        processingDate, fi.`user_id`, 1 AS classify
        FROM mom_ocean.finished_inspect fi
        WHERE fi.`state` = 1) fi
        WHERE fi.id = ru.raw_inspect_id
        AND ru.`type` = fi.`classify`
        AND ru.type != 0
        AND ru.state=1
        AND fi.`user_id` = u.`id`
        <if test="dealState!=null">
            and deal_state = #{dealState}
            and ru.deal_state = #{dealState}
        </if>
        <if test="formTime!=null and formTime!=''">
            and fi.create_time=#{formTime}
            and fi.dateArrival=#{formTime}
        </if>
        <if test="productCategories != null">
            and ru.`type` = #{productCategories}
        </if>
        order by ru.id desc
    </select>

    <!--原材料不合格-->
    <!--原材料不合格品-->
    <select id="selectUnqualifiedRawMaterials" resultType="map">
        SELECT i.id,
               DATE_FORMAT(r.form_time, '%Y-%m-%d') dateArrival,
@@ -51,8 +66,8 @@
               r.`supplier`,
               i.`deal_state`,
               i.`deal_reasult`
        FROM inspect_unaccepted i
                 LEFT JOIN raw_inspect r ON i.`raw_inspect_id` = r.`id`
        FROM mom_ocean.inspect_unaccepted i
                 LEFT JOIN mom_ocean.raw_inspect r ON i.`raw_inspect_id` = r.`id`
        WHERE i.`state` = 1
          AND i.`type` = 0
        <if test="formTime != null and formTime != ''">
@@ -74,12 +89,12 @@
    <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`
        FROM inspect_unaccepted i
        FROM mom_ocean.inspect_unaccepted i
        LEFT JOIN
        (
            -- 原材料
            SELECT 0 AS `type`, r.`name`, r.`specifications`, r.`number`, r.`id`, r.`user_name`
            FROM raw_inspect r
            FROM mom_ocean.raw_inspect r
            WHERE r.state = 1
            <if test="specificationModel != null and specificationModel != ''">AND r.`specifications` LIKE CONCAT('%',
                #{specificationModel}, '%')
@@ -90,7 +105,7 @@
            UNION ALL
            -- 成品
            SELECT 1 AS `type`, f.`project_name` `name`, f.`specifications_model` specifications, f.`quantity` `number`, f.`id`, u.name user_name
            FROM finished_inspect f, `user` u
            FROM mom_ocean.finished_inspect f, mom_ocean.`user` u
            WHERE f.`state` = 1
              AND u.id = f.user_id
            <if test="specificationModel != null and specificationModel != ''">
@@ -102,7 +117,7 @@
            UNION ALL
            -- 半成品
            SELECT 2 AS `type`, p.`material` `name`, p.`specifications_model` specifications, p.`quantity` `number`, p.`id`, u.name user_name
            FROM process_inspect p, `user` u
            FROM mom_ocean.process_inspect p, mom_ocean.`user` u
            WHERE p.state = 1
                AND u.id = p.user_id
            <if test="specificationModel != null and specificationModel != ''">
@@ -113,12 +128,13 @@
            </if>
         )AS s ON s.`id` = i.`raw_inspect_id` AND s.`type` = i.type
        WHERE i.`state` = 1
          AND i.`deal_reasult` = 0
        <if test="state != null">
            AND i.`deal_state` = #{state}
        </if>
        <if test="productCategories != null">
            AND s.`type` = #{productCategories}
        </if>
        ORDER BY i.id DESC
        ORDER BY i.`update_time` DESC
    </select>
</mapper>

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

@@ -56,14 +56,15 @@
        <if test="name!=null and name!=''">
            and name like concat('%',#{name},'%')
        </if>
        ORDER BY id DESC
    </select>

    <!--根据原材料检验单id查看详情-->
    <resultMap id="oneMap" type="map">
        <id property="rcode" column="rcode"/>
        <id property="code" column="rcode"/>
        <result property="formTime" column="formTime"/>
        <result property="creatTime" column="creatTime"/>
        <result property="rname" column="rname"/>
        <result property="name" column="rname"/>
        <result property="specifications" column="specifications"/>
        <result property="runit" column="runit"/>
        <result property="number" column="number"/>
@@ -72,7 +73,7 @@
        <result property="userName" column="user_name"/>
        <collection property="children" resultMap="twoMap" javaType="List"/>
    </resultMap>
    <resultMap id="twoMap" type="map">
    <resultMap id="twoMap" type="Map">
        <id property="rpId" column="rpId"/>
        <result property="rpName" column="rpName"/>
        <result property="rpUnit" column="rpUnit"/>
@@ -80,7 +81,8 @@
        <result property="internal" column="internal"/>
        <result property="testValue" column="test_value"/>
        <result property="testState" column="test_state"/>
        <result property="devName" column="devName"/>
        <result property="deviceName" column="devName"/>
        <result property="deviceId" column="deviceId"/>
        <result property="uName" column="uName"/>
    </resultMap>

@@ -103,6 +105,7 @@
               test_value,
               test_state,
               device.name                            devName,
               device.`id`                            deviceId,
               user.name                              uName
        from mom_ocean.raw_ins_product rp
                 left join mom_ocean.raw_inspect r on rp.raw_inspect_id = r.id

 system-run/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@
logging:
  config: classpath:logback-spring.xml
  # 日志存储路径+++++++++++++++++++++++++++运维需要配置+++++++++++++++++++++++++++
  file-location:
  file-location: /abc

# 数据库备份路径
backup: