模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有

zss

2024-07-30 788b1abbdc75d6bc727be65fc107fb10eaa484b6

模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有

 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -279,5 +279,12 @@
    public Result treeDevice(String deviceName) {
        return Result.success(deviceService.treeDevice(deviceName));
    }


    @ApiOperation(value = "温度循环数采总体")
    @PostMapping("/temDataAcquisition2")
    public Result<?> temDataAcquisition2(@RequestBody PkMaster pkMaster) {
        return Result.success(pkMasterService.temDataAcquisition2(pkMaster));
    }
}


 cnas-server/src/main/java/com/yuanchu/mom/mapper/PkSlaveMapper.java

@@ -2,6 +2,9 @@

import com.yuanchu.mom.pojo.PkSlave;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +16,5 @@
 */
public interface PkSlaveMapper extends BaseMapper<PkSlave> {

    List<PkSlave> selectList1(@Param("isid") String isid);
}

 cnas-server/src/main/java/com/yuanchu/mom/service/PkMasterService.java

@@ -15,4 +15,7 @@

    //温度循环数采
    int temDataAcquisition(PkMaster pkMaster);

    //温度循环数采总体
    int temDataAcquisition2(PkMaster pkMaster);
}

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkMasterServiceImpl.java

@@ -19,6 +19,8 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.*;

@@ -77,7 +79,7 @@
        if (ObjectUtils.isEmpty(master)) {
            throw new ErrorException("没有找到对应委托单" + pkMaster.getEntrustCode() + "的数采数据");
        }
        List<PkSlave> pkSlaves = pkSlaveMapper.selectList(Wrappers.<PkSlave>lambdaQuery().eq(PkSlave::getShiftId, master.getIsid()));
        List<PkSlave> pkSlaves = pkSlaveMapper.selectList1(master.getIsid());
        if (CollectionUtils.isEmpty(pkSlaves)) {
            throw new ErrorException("没有找到对应委托单" + pkMaster.getEntrustCode() + "的数采子数据");
        }
@@ -122,89 +124,92 @@
                        //1310nm外端
                        Map<String, Object> map1 = new HashMap<>();
                        map1.put("u", userId + "");
                        map1.put("v", pkSlave.getWeaken1310A());
                        map1.put("v", pkSlave.getWeaken1310A().toString());
                        iv.add(map1);
                        //1310nm内端
                        Map<String, Object> map2 = new HashMap<>();
                        map2.put("u", userId + "");
                        map2.put("v", pkSlave.getWeaken1310B());
                        map2.put("v", pkSlave.getWeaken1310B().toString());
                        iv.add(map2);
                        //1310nm衰减系数
                        Map<String, Object> map3 = new HashMap<>();
                        map3.put("v", (pkSlave.getWeaken1310A() + pkSlave.getWeaken1310B()) / 2);
                        double v = (pkSlave.getWeaken1310A() + pkSlave.getWeaken1310B()) / 2;
                        BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
                        map3.put("v", String.valueOf(decimal));
                        cv.add(map3);
                    }
                    else if (productVo.getInsProduct().getInspectionItemClass().equals("1550nm")) {
                    } else if (productVo.getInsProduct().getInspectionItemClass().equals("1550nm")) {
                        //1550nm外端
                        Map<String, Object> map1 = new HashMap<>();
                        map1.put("u", userId + "");
                        map1.put("v", pkSlave.getWeaken1550A());
                        map1.put("v", pkSlave.getWeaken1550A().toString());
                        iv.add(map1);
                        //1550nm内端
                        Map<String, Object> map2 = new HashMap<>();
                        map2.put("u", userId + "");
                        map2.put("v", pkSlave.getWeaken1550B());
                        map2.put("v", pkSlave.getWeaken1550B().toString());
                        iv.add(map2);
                        //1550nm衰减系数
                        Map<String, Object> map3 = new HashMap<>();
                        map3.put("v", (pkSlave.getWeaken1550A() + pkSlave.getWeaken1550B()) / 2);
                        double v = (pkSlave.getWeaken1550A() + pkSlave.getWeaken1550B()) / 2;
                        BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
                        map3.put("v", String.valueOf(decimal));
                        cv.add(map3);
                    }
                    else if (productVo.getInsProduct().getInspectionItemClass().equals("1625nm")) {
                    } else if (productVo.getInsProduct().getInspectionItemClass().equals("1625nm")) {
                        //1625nm外端
                        Map<String, Object> map1 = new HashMap<>();
                        map1.put("u", userId + "");
                        map1.put("v", pkSlave.getWeaken1625A());
                        map1.put("v", pkSlave.getWeaken1625A().toString());
                        iv.add(map1);
                        //1625nm内端
                        Map<String, Object> map2 = new HashMap<>();
                        map2.put("u", userId + "");
                        map2.put("v", pkSlave.getWeaken1625B());
                        map2.put("v", pkSlave.getWeaken1625B().toString());
                        iv.add(map2);
                        //1625nm衰减系数
                        Map<String, Object> map3 = new HashMap<>();
                        map3.put("v", (pkSlave.getWeaken1625A() + pkSlave.getWeaken1625B()) / 2);
                        double v = (pkSlave.getWeaken1625A() + pkSlave.getWeaken1625B()) / 2;
                        BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
                        map3.put("v", String.valueOf(decimal));
                        cv.add(map3);
                    }
                    else if (productVo.getInsProduct().getInspectionItemClass().equals("1383nm")) {
                    } else if (productVo.getInsProduct().getInspectionItemClass().equals("1383nm")) {
                        //1383nm外端
                        Map<String, Object> map1 = new HashMap<>();
                        map1.put("u", userId + "");
                        map1.put("v", pkSlave.getWeaken1383A());
                        map1.put("v", pkSlave.getWeaken1383A().toString());
                        iv.add(map1);
                        //1383nm内端
                        Map<String, Object> map2 = new HashMap<>();
                        map2.put("u", userId + "");
                        map2.put("v", pkSlave.getWeaken1383B());
                        map2.put("v", pkSlave.getWeaken1383B().toString());
                        iv.add(map2);
                        //1383nm衰减系数
                        Map<String, Object> map3 = new HashMap<>();
                        map3.put("v", (pkSlave.getWeaken1383A() + pkSlave.getWeaken1383B()) / 2);
                        double v = (pkSlave.getWeaken1383A() + pkSlave.getWeaken1383B()) / 2;
                        BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
                        map3.put("v", String.valueOf(decimal));
                        cv.add(map3);
                    }
                    else if (productVo.getInsProduct().getInspectionItemClass().equals("1490nm")) {
                    } else if (productVo.getInsProduct().getInspectionItemClass().equals("1490nm")) {
                        //1490nm外端
                        Map<String, Object> map1 = new HashMap<>();
                        map1.put("u", userId + "");
                        map1.put("v", pkSlave.getWeaken1490A());
                        map1.put("v", pkSlave.getWeaken1490A().toString());
                        iv.add(map1);
                        //1490nm内端
                        Map<String, Object> map2 = new HashMap<>();
                        map2.put("u", userId + "");
                        map2.put("v", pkSlave.getWeaken1490B());
                        map2.put("v", pkSlave.getWeaken1490B().toString());
                        iv.add(map2);
                        //1490nm衰减系数
                        Map<String, Object> map3 = new HashMap<>();
                        map3.put("v", (pkSlave.getWeaken1490A() + pkSlave.getWeaken1490B()) / 2);
                        double v = (pkSlave.getWeaken1490A() + pkSlave.getWeaken1490B()) / 2;
                        BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
                        map3.put("v", String.valueOf(decimal));
                        cv.add(map3);
                    }
                    else {
                    } else {
                        throw new ErrorException("没有找到该温度的检验项目" + productVo.getInsProduct().getInspectionItemClass());
                    }
                    result.setInsValue(JSON.toJSONString(iv));//检验值
                    result.setComValue(JSON.toJSONString(cv));//计算值
                    result.setEquipValue(null);//设备编号
                    result.setEquipName(null);//设备名称
                    if (BeanUtil.isEmpty(result.getId())) {
                        result.setCreateUser(userId);
                        result.setUpdateUser(userId);
@@ -216,7 +221,8 @@
                    }

                    InsProduct insProduct = productVo.getInsProduct();
                    String comple = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId())).getComValue().split(":")[1].split("\"")[1];
                    InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
                    String comple = insProductResult.getComValue().split(":")[1].split("\"")[1];
                    //首先查看温度是否是20度常温
                    if (!pkMaster.getTemperature().equals("20℃(常温)")) {
                        //如果不是先查询是否有值
@@ -297,9 +303,11 @@
                                    break;
                            }
                            InsProductResult insProductRes = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insPro.getId()));
                            insProduct.setLastValue(String.valueOf(Math.abs(Double.parseDouble(insProductRes.getComValue().split(":")[1].split("\"")[1]) - Double.parseDouble(comple))));
                            double abs = Math.abs(Double.parseDouble(insProductRes.getComValue().split(":")[1].split("\"")[1]) - Double.parseDouble(comple));
                            BigDecimal scale = BigDecimal.valueOf(abs).setScale(3, RoundingMode.HALF_UP);
                            insProduct.setLastValue(String.valueOf(scale));
                            String ask = insProduct.getAsk();
                            int insResult=1;
                            int insResult = 1;
                            switch (ask.charAt(0)) {
                                case '<':
                                    insResult = Double.parseDouble(insProduct.getLastValue()) < Double.parseDouble(ask.substring(1)) ? 1 : 0;
@@ -319,21 +327,56 @@
                            }
                            insProduct.setInsResult(insResult);
                        }
                    }
                    else {
                    } else {
                        //如果是20度常温,需要给出合格的结论
                        insProduct.setInsResult(1);//20度常温的检验项默认为合格
                    }
                    insProduct.setUpdateUser(userId);
                    insProductMapper.updateById(insProduct);
                    User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, pkMaster.getDetectionPeople()));
                    if (ObjectUtils.isNotEmpty(user)){
                        throw new ErrorException("lims系统没有找到该用户"+ pkMaster.getDetectionPeople());
                    User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, master.getDetectionPeople()));
                    if (ObjectUtils.isEmpty(user)) {
                        throw new ErrorException("lims系统没有找到该用户" + master.getDetectionPeople());
                    }
                    insProductUserMapper.insert(new InsProductUser(null, user.getId(), pkMaster.getDetectionDate(), insProduct.getId()));
                    insProductUserMapper.insert(new InsProductUser(null, user.getId(), master.getDetectionDate(), insProduct.getId()));
                }
            }
        }

        //给温度循环的检验项目绑定设备
        InsProduct product = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getState, 1)
                .eq(InsProduct::getInsSampleId, insSample.getId())
                .eq(InsProduct::getInspectionItem, "温度循环"));
        if (ObjectUtils.isEmpty(map)) {
            throw new ErrorException("没有找到对应委托单下该样品的相关温度循环检验项目");
        }
        InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, product.getId()));
        if(ObjectUtils.isEmpty(insProductResult.getEquipValue())) {
            List<Map<String, Object>> dv = new ArrayList<>();
            Map<String, Object> map4 = new HashMap<>();
            map4.put("v", "JCZX-TX-TT02006");
            dv.add(map4);
            Map<String, Object> map5 = new HashMap<>();
            map5.put("v", "JCZX-TX-TT02001");
            dv.add(map5);
            insProductResult.setEquipValue(JSON.toJSONString(dv));
            List<Map<String, Object>> dn = new ArrayList<>();
            Map<String, Object> map6 = new HashMap<>();
            map6.put("v", "步入式高低温湿热试验箱");
            dn.add(map6);
            Map<String, Object> map7 = new HashMap<>();
            map7.put("v", "步入式高低温试验箱");
            dn.add(map7);
            insProductResult.setEquipName(JSON.toJSONString(dn));
            insProductResultMapper.updateById(insProductResult);
        }
        return 0;
    }

    //温度循环数采总体
    @Override
    @Transactional(rollbackFor = Exception.class)
    public int temDataAcquisition2(PkMaster pkMaster) {
        return 0;
    }
}

 cnas-server/src/main/resources/mapper/PkSlaveMapper.xml

@@ -22,4 +22,7 @@
        <result column="create_time" property="createTime" />
    </resultMap>

    <select id="selectList1" resultMap="BaseResultMap">
        select * from device_pk_slave where shift_id=#{isid}
    </select>
</mapper>

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

@@ -111,8 +111,8 @@
    @ApiOperation(value = "查询检验单模板")
    @GetMapping("/selectInsOrderTemplate")
    @ValueAuth
    public Result<?> selectInsOrderTemplate() {
        return Result.success(insOrderTemplateService.selectInsOrderTemplate());
    public Result<?> selectInsOrderTemplate(String company) {
        return Result.success(insOrderTemplateService.selectInsOrderTemplate(company));
    }

    @ApiOperation(value = "通过检验单模板id获取检验单模板内容")

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

@@ -14,7 +14,7 @@

    int addInsOrderTemplate(InsOrderTemplate insOrderTemplate);

    List<InsOrderTemplate> selectInsOrderTemplate();
    List<InsOrderTemplate> selectInsOrderTemplate(String company);

    String selectInsOrderTemplateById(Integer id);


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

@@ -12,14 +12,14 @@
import java.util.List;

/**
* @author Administrator
* @description 针对表【ins_order_template】的数据库操作Service实现
* @createDate 2024-03-18 14:14:54
*/
 * @author Administrator
 * @description 针对表【ins_order_template】的数据库操作Service实现
 * @createDate 2024-03-18 14:14:54
 */
@Service
@AllArgsConstructor
public class InsOrderTemplateServiceImpl extends ServiceImpl<InsOrderTemplateMapper, InsOrderTemplate>
    implements InsOrderTemplateService{
        implements InsOrderTemplateService {

    private InsOrderTemplateMapper insOrderTemplateMapper;

@@ -31,8 +31,16 @@
    }

    @Override
    public List<InsOrderTemplate> selectInsOrderTemplate() {
        return insOrderTemplateMapper.selectList(Wrappers.<InsOrderTemplate>lambdaQuery().eq(InsOrderTemplate::getCreateUser, getLook.selectPowerByMethodAndUserId(null).get("userId")).select(InsOrderTemplate.class, info->!info.getColumn().equals("thing")));
    public List<InsOrderTemplate> selectInsOrderTemplate(String company) {
        if (company == null) {
            return insOrderTemplateMapper.selectList(Wrappers.<InsOrderTemplate>lambdaQuery()
                    .select(InsOrderTemplate.class, info -> !info.getColumn().equals("thing")));
        } else {
            //根据委托单位进行筛选
            return insOrderTemplateMapper.selectList(Wrappers.<InsOrderTemplate>lambdaQuery()
                    .like(InsOrderTemplate::getThing,"\"company\":\""+ company+"\"")
                    .select(InsOrderTemplate.class, info -> !info.getColumn().equals("thing")));
        }
    }

    @Override

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

@@ -116,6 +116,7 @@
        String model2 = "";
        while (matcher.find()) {
            model2 += matcher.group();
            break;
        }
        if (str.contains("≥") || str.contains(">=")) {
            String param = str.replace("≥", "").replace(">=", "");

 inspect-server/src/main/resources/static/report-template.docx

Binary files differ