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

@@ -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

 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;
@@ -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"/>
@@ -90,6 +91,7 @@
               specifications,
               r.unit                             runit,
               number,
               DATE_FORMAT(r.create_time, '%Y-%m-%d') creatTime,
               supplier,
               judge_state,
               user_name,

 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">