Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-09 4ad61e4c257621124625a89853eaa8334a11b0be

Merge remote-tracking branch 'origin/master'

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

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

@@ -30,7 +30,7 @@
        </if>
        <if test="message!=null and message!=''">
            and code like concat('%',#{message},'%')
            or name like concat('%',#{message},'%')
            or device.name like concat('%',#{message},'%')
        </if>
    </select>
    <!--根据设备分组查询设备-->

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

@@ -16,7 +16,7 @@
        <result property="name" column="father"/>
    </resultMap>
    <select id="selectAllTechTem" resultMap="selectAllTechTemMap">
        select  e.name elname,
        select e.name elname,
        father
        from mom_ocean.technology_template t,
        mom_ocean.element e,
@@ -24,6 +24,7 @@
        where e.id = et.element_id
        and t.id = tech_tem_id
        and t.state = 1
        and et.state=1
        and type=#{type}
        <if test="message!=null and message!=''">
            and father like concat('%',#{message},'%')

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

@@ -57,5 +57,16 @@
        rawInsProductService.updaterawInsProduct(userId,rpId,testValue,devId);
        return Result.success();
    }

    @ApiOperation(value = "更改设备")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "rpId", value = "原材料检验项目id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "DevId", value = "设备id", dataTypeClass = Integer.class,required = true)
    })
    @PostMapping("/updateDevByRpId")
    public Result updateDevByRpId(Integer rpId ,Integer devId) {
        rawInsProductService.updateDevByRpId(rpId,devId);
        return Result.success();
    }
}


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

@@ -22,5 +22,11 @@
    void updaterawInsProduct(int userId, Integer rpId ,String testValue,Integer devId);


    /**
     * 只更改设备,之前的检验值删掉
     * @param rpId
     * @param devId
     */
    void updateDevByRpId(Integer rpId, Integer devId);
}


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

@@ -39,7 +39,7 @@
     * @param id
     * @return
     */
    Map<String, Object> selectRawInspectsListById(Integer id);
    Map<String,Object> selectRawInspectsListById(Integer id);

    /**
     * 更新检验状态

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

@@ -8,6 +8,7 @@
import com.yuanchu.mom.pojo.RawInspect;
import com.yuanchu.mom.service.RawInsProductService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Date;
@@ -32,7 +33,7 @@

    //更新检验项目(填写检验值,检验设备)
    @Override
    public void updaterawInsProduct(int userId,Integer rpId ,String testValue,Integer devId) {
    public void updaterawInsProduct(int userId, Integer rpId, String testValue, Integer devId) {
        RawInsProduct rawInsProduct = rawInsProductMapper.selectById(rpId);
        //赋值设备
        rawInsProduct.setDeviceId(devId);
@@ -49,7 +50,7 @@
        if (list.contains(0)) {
            //如果其中一个检验值不合格则该项目检验不合格
            rawInsProduct.setTestState(0);
        }else {
        } else {
            rawInsProduct.setTestState(1);
        }
        /*更新原材料检验项目表*/
@@ -60,6 +61,17 @@
        rawInspectMapper.updateById(rawInspect);
    }

    //只更改设备,之前的检验值删掉
    @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);
    }

    /*判断检测值是否满足标准值和内控值的要求,如果不满足则检验结论为不合格*/
    private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
        boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);

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

@@ -62,6 +62,7 @@
    <resultMap id="oneMap" type="map">
        <id property="rcode" column="rcode"/>
        <result property="formTime" column="formTime"/>
        <result property="creatTime" column="creatTime"/>
        <result property="rname" column="rname"/>
        <result property="specifications" column="specifications"/>
        <result property="runit" column="runit"/>
@@ -84,24 +85,25 @@
    </resultMap>

    <select id="selectRawInspectsListById" resultMap="oneMap">
        select DATE_FORMAT(form_time, '%Y-%m-%d') formTime,
               r.code                             rcode,
               r.name                             rname,
        select DATE_FORMAT(form_time, '%Y-%m-%d')     formTime,
               r.code                                 rcode,
               r.name                                 rname,
               specifications,
               r.unit                             runit,
               r.unit                                 runit,
               number,
               DATE_FORMAT(r.create_time, '%Y-%m-%d') creatTime,
               supplier,
               judge_state,
               user_name,
               rp.id                              rpId,
               rp.name                            rpName,
               rp.unit                            rpUnit,
               rp.id                                  rpId,
               rp.name                                rpName,
               rp.unit                                rpUnit,
               required,
               internal,
               test_value,
               test_state,
               device.name                        devName,
               user.name                          uName
               device.name                            devName,
               user.name                              uName
        from mom_ocean.raw_ins_product rp
                 left join mom_ocean.raw_inspect r on rp.raw_inspect_id = r.id
                 left join mom_ocean.device

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

@@ -58,7 +58,7 @@
    @PostMapping("/compile")
    public Result compile(Integer id) {
        ordersService.compile(id);
        return Result.success("编制产品"+id+"完成!");
        return Result.success("编制产品完成!");
    }

}

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

@@ -12,7 +12,7 @@

    <!--右侧数据展示 工艺路线-->
    <resultMap id="selectAllTecMap" type="map">
        <id property="name" column="father"/>
        <id property="father" column="father"/>
        <collection property="children" resultMap="selectAllTecMaps" javaType="List"/>
    </resultMap>
    <resultMap id="selectAllTecMaps" type="map">