Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-a...

chenrui

2025-04-08 9f8f73240c885488fdffc1062826520cf7abb86b

Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency

 basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java

@@ -13,6 +13,6 @@

    private String value;

    private List<SampleTypeDto> children;
    private List<ObjectTypeDto> children;

}

 basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java

@@ -5,7 +5,7 @@
@Data
public class ModelDto {

    private String code = "[5]";
    private String code = "[7]";

    private String label;


 basic-server/src/main/java/com/ruoyi/basic/dto/ObjectTypeDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.basic.dto;

import lombok.Data;

import java.util.List;

@Data
public class ObjectTypeDto {

    private String code = "[3]";

    private String label;

    private String value;

    private List<WorkShopNameDto> children;

}

 basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java

@@ -12,4 +12,6 @@
    private Integer workShopId;

    private String workShopName;

    private String labelName;
}

 basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java

@@ -8,7 +8,7 @@
@Data
public class SampleDto {

    private String code = "[4]";
    private String code = "[6]";

    private String label;


 basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java

@@ -7,7 +7,7 @@
@Data
public class SampleTypeDto {

    private String code = "[3]";
    private String code = "[5]";

    // æ£€æµ‹å¯¹è±¡id
    private Integer sampleTypeId;

 basic-server/src/main/java/com/ruoyi/basic/dto/WorkShopDto.java

@@ -1,6 +1,8 @@
package com.ruoyi.basic.dto;

import com.ruoyi.basic.pojo.WorkShop;
import lombok.Data;

@Data
public class WorkShopDto extends WorkShop {
}

 basic-server/src/main/java/com/ruoyi/basic/dto/WorkShopNameDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.basic.dto;

import com.ruoyi.basic.pojo.WorkShop;
import lombok.Data;

import java.util.List;

@Data
public class WorkShopNameDto{

    private String code = "[4]";

    private String label;

    private String value;

    private List<SampleTypeDto> children;
}

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java

@@ -14,13 +14,10 @@
import com.ruoyi.basic.service.StandardMethodListService;
import com.ruoyi.basic.service.StandardProductListSupplierAskService;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.basic.service.StandardProductListService;
import lombok.AllArgsConstructor;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -50,33 +47,24 @@

    private ProductPartMapper productPartMapper;

    private StructureTestObjectPartMapper  structureTestObjectPartMapper;
    private StructureTestObjectPartMapper structureTestObjectPartMapper;

    @Autowired
    private StandardMethodListService standardMethodListService;

    @Autowired
    private StructureItemParameterMapper structureItemParameterMapper;

    @Autowired
    private ModelMapper modelMapper;

    @Autowired
    private StandardProductListBackupRelMapper standardProductListBackupRelMapper;

    @Autowired
    private StandardProductListUpdateRecordMapper standardProductListUpdateRecordMapper;

    @Autowired
    private StandardProductListUpdateRecordRelMapper standardProductListUpdateRecordRelMapper;

    @Autowired
    private StandardProductListSupplierAskService standardProductListSupplierAskService;

    @Autowired
    private StandardProductListSupplierAskBackupRelMapper  standardProductListSupplierAskBackupRelMapper;
    private StandardProductListSupplierAskBackupRelMapper standardProductListSupplierAskBackupRelMapper;

    @Autowired
    private StandardMethodMapper standardMethodMapper;


@@ -84,25 +72,25 @@
    public int upStandardProductList(StandardProductList list) {
        // æ ¹æ®id æŸ¥è¯¢åˆ°åŽŸå§‹å€¼
        StandardProductList standardProductList = standardProductListMapper.selectById(list.getId());
        if(ObjectUtils.isEmpty(standardProductList)){
        if (ObjectUtils.isEmpty(standardProductList)) {
            throw new RuntimeException("更新失败,未查找到检查项");
        }
        // åˆ¤æ–­å½“前状态 å¦‚果是审核中
        if(StandardProductListChcekTypeEnums.CHECK_ING.getCode().equals(list.getCheckStatus())){
        if (StandardProductListChcekTypeEnums.CHECK_ING.getCode().equals(list.getCheckStatus())) {
            throw new RuntimeException("审核中不支持修改");
        }
        // åˆ¤æ–­æ£€éªŒé¡¹æ˜¯å¦ä¸ºæ˜¯å¦å§”托要求 æ˜¯çš„话不需要做备份和状态修改直接更新
        StructureItemParameter structureItemParameter = structureItemParameterMapper.selectById(standardProductList.getStructureItemParameterId());
        if(!ObjectUtils.isEmpty(structureItemParameter) && "1".equals(structureItemParameter.getDelegateRequestFlag())){
        if (!ObjectUtils.isEmpty(structureItemParameter) && "1".equals(structureItemParameter.getDelegateRequestFlag())) {
            return standardProductListMapper.updateById(list);
        }
        // åˆ¤æ–­æ˜¯å¦ä¸ºç”Ÿæ•ˆçš„修改如果是不做备份
        if(null != list.getState()){
        if (null != list.getState()) {
            return standardProductListMapper.updateById(list);
        }
        // æŸ¥è¯¢æœ€æ–°çš„一次关联备份 å¦‚果存在说明未审核完继续修改了。不做数据处理。
        StandardProductListBackupRel standardProductListBackupRel = standardProductListBackupRelMapper.selectById(list.getId());
        if(ObjectUtils.isEmpty(standardProductListBackupRel)){
        if (ObjectUtils.isEmpty(standardProductListBackupRel)) {
            StandardProductListBackupRel productListBackupRel = new StandardProductListBackupRel();
            BeanUtils.copyProperties(standardProductList, productListBackupRel);
            standardProductListBackupRelMapper.insert(productListBackupRel);
@@ -127,7 +115,7 @@
        standardProductListDto.setStandardMethodListIds(insSample.getStandardMethodListIds());
        standardProductListDto.setState(insSample.getState());
        List<StandardProductList> list = new ArrayList<>();
        if(CollectionUtils.isEmpty(standardProductListDto.getStandardMethodListIds())) {
        if (CollectionUtils.isEmpty(standardProductListDto.getStandardMethodListIds())) {
            return list;
        }
        list = standardProductListMapper.standardProductListNoPage(standardProductListDto);
@@ -221,8 +209,8 @@
        }

        ProductPart productPart = productPartMapper.selectOne(new LambdaQueryWrapper<ProductPart>().eq(ProductPart::getPartNo, insSample.getPartNo()));
        if (productPart != null){
            if (StringUtils.isNotEmpty(productPart.getInspectionItem())){
        if (productPart != null) {
            if (StringUtils.isNotEmpty(productPart.getInspectionItem())) {
                String inspectionItem = productPart.getInspectionItem();
                list = list.stream()
                        .filter(standardProductList -> inspectionItem.equals(standardProductList.getInspectionItem()))
@@ -231,8 +219,8 @@
        }

        StructureTestObjectPart structureTestObjectPart = structureTestObjectPartMapper.selectOne(new LambdaQueryWrapper<StructureTestObjectPart>().eq(StructureTestObjectPart::getPartNo, insSample.getPartNo()));
        if (structureTestObjectPart != null){
            if (StringUtils.isNotEmpty(structureTestObjectPart.getInspectionItem())){
        if (structureTestObjectPart != null) {
            if (StringUtils.isNotEmpty(structureTestObjectPart.getInspectionItem())) {
                String inspectionItem = structureTestObjectPart.getInspectionItem();
                list = list.stream()
                        .filter(standardProductList -> inspectionItem.equals(standardProductList.getInspectionItem()))
@@ -243,16 +231,15 @@
    }

    /**
     *
     * @param str                 åˆ¤å®šå…¬å¼
     * @param model               åž‹å·
     * @param standardCores       èŠ¯æ•°
     * @param conductorMaterial   å¯¼ä½“材质
     * @param conductorType       å¯¼ä½“类型
     * @param str               åˆ¤å®šå…¬å¼
     * @param model             åž‹å·
     * @param standardCores     èŠ¯æ•°
     * @param conductorMaterial å¯¼ä½“材质
     * @param conductorType     å¯¼ä½“类型
     * @param insSample
     * @return
     */
    private boolean getIsIf(String str, String model, String standardCores, String conductorMaterial, String conductorType,InsSampleReceiveDto insSample) {
    private boolean getIsIf(String str, String model, String standardCores, String conductorMaterial, String conductorType, InsSampleReceiveDto insSample) {
        Matcher matcher = Pattern.compile("\\d+(\\.\\d+)?").matcher(model);
        String model2 = "";
        while (matcher.find()) {
@@ -325,11 +312,11 @@
        boolean existWorkShopFlag = standardMethodListService.existWorkShop(tree);
        // æ‹¼æŽ¥æ ‘
        String[] trees = tree.split(" - ");
        if(trees == null && trees.length < 4){
        if (trees == null && trees.length < 4) {
            return map;
        }
        // è½¦é—´å±‚级多一层级
        if(existWorkShopFlag){
        if (existWorkShopFlag) {
            switch (trees.length) {
                case 7:
                    sampleType = trees[4];
@@ -347,7 +334,7 @@
                    checkItemQueryTree.append("[").append("\"").append(trees[4]).append("\"").append("]");
                    break;
            }
        }else {
        } else {
            switch (trees.length) {
                case 6:
                    sampleType = trees[3];
@@ -366,18 +353,18 @@
                    break;
            }
        }
        if(StringUtils.isEmpty(checkItemQueryTree.toString())){
        if (StringUtils.isEmpty(checkItemQueryTree.toString())) {
            return map;
        }
        // åˆ¤æ–­æ˜¯å¦ä¸ºå§”托要求标准
        StandardMethod standardMethod = standardMethodMapper.selectById(id);
        if(ObjectUtils.isEmpty(standardMethod)){
        if (ObjectUtils.isEmpty(standardMethod)) {
            return map;
        }
        StructureItemParameterDto structureItemParameterDto = new StructureItemParameterDto();
        if(standardMethod.getName().equals("委托要求")){
        if (standardMethod.getName().equals("委托要求")) {
            structureItemParameterDto.setDelegateRequestFlag("1");
        }else {
        } else {
            structureItemParameterDto.setDelegateRequestFlag("0");
        }
        structureItemParameterDto.setTree(checkItemQueryTree.toString());
@@ -385,7 +372,7 @@
        // æ ¹æ®æ£€éªŒå¯¹è±¡/产品查询检验项
        List<StructureItemParameter> structureItemParameterList = structureItemParameterMapper.selectItemParameterBySample(structureItemParameterDto);
        // å¦‚果是产品的检查项为空向上推
        if(CollectionUtils.isEmpty(structureItemParameterList)){
        if (CollectionUtils.isEmpty(structureItemParameterList)) {
            String query = "[\"" + sampleType + "\"]";
            structureItemParameterDto.setTree(query);
            structureItemParameterList = structureItemParameterMapper.selectItemParameterBySample(structureItemParameterDto);
@@ -403,14 +390,14 @@
            boolean existFlag = false;
            // åˆ¤æ–­æ˜¯å¦å·²ç»‘定
            for (StandardProductList productList : standardProductList) {
                if(structureItemParameter.getId().equals(productList.getStructureItemParameterId())) {
                if (structureItemParameter.getId().equals(productList.getStructureItemParameterId())) {
                    BeanUtils.copyProperties(productList, addStandProductList);
                    existFlag = true;
                    break;
                }
            }
            // å¦‚果未绑定
            if(!existFlag){
            if (!existFlag) {
                BeanUtils.copyProperties(structureItemParameter, addStandProductList);
                addStandProductList.setTell(structureItemParameter.getAskTell());
                addStandProductList.setStructureItemParameterId(structureItemParameter.getId());
@@ -495,6 +482,7 @@

    /**
     * ä¿®æ”¹æ ‡å‡†åº“区间
     *
     * @param list
     * @return
     */
@@ -502,16 +490,16 @@
    public boolean updateSection(StandardProductList list) {
        // æ ¹æ®id æŸ¥è¯¢åˆ°åŽŸå§‹å€¼
        StandardProductList standardProductList = standardProductListMapper.selectById(list.getId());
        if(ObjectUtils.isEmpty(standardProductList)){
        if (ObjectUtils.isEmpty(standardProductList)) {
            throw new RuntimeException("更新失败,未查找到检查项");
        }
        // åˆ¤æ–­å½“前状态 å¦‚果是审核中
        if(StandardProductListChcekTypeEnums.CHECK_ING.getCode().equals(list.getCheckStatus())){
        if (StandardProductListChcekTypeEnums.CHECK_ING.getCode().equals(list.getCheckStatus())) {
            throw new RuntimeException("审核中不支持修改");
        }
        // æŸ¥è¯¢æœ€æ–°çš„一次关联备份 å¦‚果存在说明未审核完继续修改了。不做数据处理。
        StandardProductListBackupRel standardProductListBackupRel = standardProductListBackupRelMapper.selectById(list.getId());
        if(ObjectUtils.isEmpty(standardProductListBackupRel)){
        if (ObjectUtils.isEmpty(standardProductListBackupRel)) {
            StandardProductListBackupRel productListBackupRel = new StandardProductListBackupRel();
            BeanUtils.copyProperties(standardProductList, productListBackupRel);
            standardProductListBackupRelMapper.insert(productListBackupRel);
@@ -529,6 +517,7 @@

    /**
     * æ ‡å‡†åº“拖拽
     *
     * @param resetTreeDragDTO
     */
    @Override
@@ -547,7 +536,7 @@
                    resetTreeDragDTO.getTree());

            // ä»Žä¸‹å¾€ä¸Š
        } else if (beginIndex > endIndex){
        } else if (beginIndex > endIndex) {
            standardProductListMapper.updateSortDown(beginIndex,
                    endIndex,
                    methodId,
@@ -568,6 +557,7 @@

    /**
     * æ£€éªŒé¡¹è¦æ±‚值对比
     *
     * @param copyDto
     * @return
     */
@@ -611,6 +601,7 @@

    /**
     * æ£€éªŒé¡¹å¤åˆ¶å¯¹æ¯”一个
     *
     * @param dto
     * @return
     */
@@ -645,6 +636,7 @@

    /**
     * æ£€éªŒé¡¹å¤åˆ¶æŽ’序
     *
     * @param copyDto
     * @return
     */
@@ -683,9 +675,9 @@
    public void productListSubmit(StandardProductListUpdateRecord standardProductListUpdateRecord) {
        // æŸ¥è¯¢æ‰€æœ‰å¾…审核的数据
        QueryWrapper<StandardProductList> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("check_status",StandardProductListChcekTypeEnums.WAIT_CHECK.getCode());
        queryWrapper.eq("check_status", StandardProductListChcekTypeEnums.WAIT_CHECK.getCode());
        List<StandardProductList> unCheckStandardProductListArray = standardProductListMapper.selectList(queryWrapper);
        if(CollectionUtils.isEmpty(unCheckStandardProductListArray)){
        if (CollectionUtils.isEmpty(unCheckStandardProductListArray)) {
            throw new RuntimeException("暂无修改数据");
        }
        List<Long> standardProductListIds = new ArrayList<>();
@@ -705,11 +697,12 @@
        }

        // ä¿®æ”¹æ ‡å‡†æ ‘下检查项状态为审核中
        standardProductListMapper.updateProductListCheckStatus(standardProductListIds,StandardProductListChcekTypeEnums.CHECK_ING.getCode());
        standardProductListMapper.updateProductListCheckStatus(standardProductListIds, StandardProductListChcekTypeEnums.CHECK_ING.getCode());
    }

    /**
     * æ ‡å‡†æ ‘下检验项审核
     *
     * @param standardProductListUpdateRecord
     */
    @Override
@@ -717,9 +710,9 @@
    public void productListCheck(StandardProductListUpdateRecord standardProductListUpdateRecord) {
        // æŸ¥è¯¢æ‰€æœ‰å®¡æ ¸ä¸­çš„数据
        QueryWrapper<StandardProductList> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("check_status",StandardProductListChcekTypeEnums.CHECK_ING.getCode());
        queryWrapper.eq("check_status", StandardProductListChcekTypeEnums.CHECK_ING.getCode());
        List<StandardProductList> standardProductListArray = standardProductListMapper.selectList(queryWrapper);
        if(CollectionUtils.isEmpty(standardProductListArray)){
        if (CollectionUtils.isEmpty(standardProductListArray)) {
            return;
        }
        List<Long> standardProductListIds = new ArrayList<>();
@@ -727,12 +720,12 @@
            standardProductListIds.add(standardProductList.getId());
        }
        // å®¡æ ¸é€šè¿‡
        if(StandardProductListChcekTypeEnums.PASS_CHECK.getCode().equals(standardProductListUpdateRecord.getCheckStatus())){
        if (StandardProductListChcekTypeEnums.PASS_CHECK.getCode().equals(standardProductListUpdateRecord.getCheckStatus())) {
            // ä¿®æ”¹çŠ¶æ€
            standardProductListMapper.updateProductListCheckStatus(standardProductListIds,StandardProductListChcekTypeEnums.PASS_CHECK.getCode());
            standardProductListMapper.updateProductListCheckStatus(standardProductListIds, StandardProductListChcekTypeEnums.PASS_CHECK.getCode());
        }
        // å®¡æ ¸æœªé€šè¿‡
        if(StandardProductListChcekTypeEnums.NO_PASS_CHECK.getCode().equals(standardProductListUpdateRecord.getCheckStatus())){
        if (StandardProductListChcekTypeEnums.NO_PASS_CHECK.getCode().equals(standardProductListUpdateRecord.getCheckStatus())) {
            // æŸ¥è¯¢æ‰€æœ‰æ ‡å‡†æ ‘下的检验项目备份数据
            List<StandardProductListBackupRel> standardProductListBackupRelList = standardProductListBackupRelMapper.selectBatchIds(standardProductListIds);
            // å›žæ»šæ ‡å‡†æ ‘下的检验项目数据
@@ -743,11 +736,11 @@
            }
            // å›žæ»šæ£€éªŒé¡¹ç›®åŽ‚家密度绑定表数据
            QueryWrapper<StandardProductListSupplierAskBackupRel> supplierAskBackupRelQueryWrapper = new QueryWrapper<>();
            supplierAskBackupRelQueryWrapper.in("product_list_id",standardProductListIds);
            supplierAskBackupRelQueryWrapper.in("product_list_id", standardProductListIds);
            List<StandardProductListSupplierAskBackupRel> standardProductListSupplierAskBackupRelList = standardProductListSupplierAskBackupRelMapper.selectList(supplierAskBackupRelQueryWrapper);
            if(!CollectionUtils.isEmpty(standardProductListSupplierAskBackupRelList)){
            if (!CollectionUtils.isEmpty(standardProductListSupplierAskBackupRelList)) {
                QueryWrapper<StandardProductListSupplierAsk> deleteWrapper = new QueryWrapper<>();
                deleteWrapper.in("product_list_id",standardProductListIds);
                deleteWrapper.in("product_list_id", standardProductListIds);
                standardProductListSupplierAskMapper.delete(deleteWrapper);
                ArrayList<StandardProductListSupplierAsk> supplierAskRollBackList = new ArrayList<>();
                for (StandardProductListSupplierAskBackupRel standardProductListSupplierAskBackupRel : standardProductListSupplierAskBackupRelList) {
@@ -774,11 +767,11 @@
    @Override
    public boolean existCheckingRecord() {
        QueryWrapper<StandardProductListUpdateRecord> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("check_status",StandardProductListChcekTypeEnums.CHECK_ING.getCode());
        queryWrapper.eq("check_status", StandardProductListChcekTypeEnums.CHECK_ING.getCode());
        List<StandardProductListUpdateRecord> standardProductListUpdateRecordList = standardProductListUpdateRecordMapper.selectList(queryWrapper);
        if(CollectionUtils.isEmpty(standardProductListUpdateRecordList)){
        if (CollectionUtils.isEmpty(standardProductListUpdateRecordList)) {
            return false;
        }else {
        } else {
            return true;
        }
    }

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java

@@ -600,15 +600,19 @@
        List<StructureTestObject> testObjects = new ArrayList<>();
        for (FactoryDto factoryDto : list) {
            for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
                List<SampleTypeDto> children = laboratoryDto.getChildren();
                int sort = 0;
                // å¾ªçŽ¯ç¬¬ä¸‰å±‚
                for (SampleTypeDto child : children) {
                    StructureTestObject structureTestObject = new StructureTestObject();
                    structureTestObject.setSort(sort);
                    structureTestObject.setId(child.getSampleTypeId());
                    testObjects.add(structureTestObject);
                    sort++;
                for (ObjectTypeDto objectTypeDto : laboratoryDto.getChildren()) {
                    for (WorkShopNameDto workShopNameDto:objectTypeDto.getChildren()) {
                        List<SampleTypeDto> children =  workShopNameDto.getChildren();
                        int sort = 0;

                        for (SampleTypeDto child : children) {
                            StructureTestObject structureTestObject = new StructureTestObject();
                            structureTestObject.setSort(sort);
                            structureTestObject.setId(child.getSampleTypeId());
                            testObjects.add(structureTestObject);
                            sort++;
                        }
                    }
                }
            }
        }

 basic-server/src/main/resources/mapper/StandardTreeMapper.xml

@@ -25,6 +25,18 @@
    <resultMap id="LaboratoryDto" type="com.ruoyi.basic.dto.LaboratoryDto">
        <result property="label" column="laboratory"/>
        <result property="value" column="laboratory"/>
        <collection property="children" resultMap="ObjectTypeDto"/>
    </resultMap>

    <resultMap id="ObjectTypeDto" type="com.ruoyi.basic.dto.ObjectTypeDto">
        <result property="label" column="object_type"/>
        <result property="value" column="object_type"/>
        <collection property="children" resultMap="workShopNameDto"/>
    </resultMap>

    <resultMap id="workShopNameDto" type="com.ruoyi.basic.dto.WorkShopNameDto">
        <result property="label" column="workShopName"/>
        <result property="value" column="workShopName"/>
        <collection property="children" resultMap="SampleTypeDto"/>
    </resultMap>

@@ -92,8 +104,10 @@
    </sql>

    <select id="selectStandardTreeList" resultMap="FactoryDto">
        select '中天科技检测中心'        factory,
        select '中天科技'        factory,
               l.laboratory_name laboratory,
               sto.object_type object_type,
               ws.`name` workShopName,
               sto.specimen_name sample_type,
               p.name            sample,
               st.model,
@@ -102,7 +116,6 @@
               sto.sort,
               sto.specimen_name_en sample_type_en,
               p.name_en sample_en,
               ws.`name` workShopName,
               ws.id workShopId
        from laboratory l
                 left join structure_test_object sto on sto.laboratory_id = l.id
@@ -169,7 +182,7 @@
        </if>
    </select>
    <select id="selectStandardTreeList2" resultType="com.ruoyi.basic.pojo.StandardTree">
        select '中天科技检测中心'        factory,
        select '中天科技'        factory,
               l.laboratory_name laboratory,
               sto.specimen_name sample_type,
               p.name            sample
@@ -250,8 +263,10 @@
        where name = #{name}
    </select>
    <select id="selectStandardTreeListByPartNo" resultMap="FactoryDto">
        select '中天科技检测中心' factory,
        select '中天科技' factory,
               l.laboratory_name  laboratory,
               sto.object_type object_type,
               ws.`name` workShopName,
               sto.specimen_name  sample_type,
               p.name             sample,
               m.model_name  model,

 basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml

@@ -198,6 +198,7 @@
    <resultMap id="productDto" type="com.ruoyi.basic.dto.ProductDto">
        <result column="pId" property="id"/>
        <result column="pName" property="name"/>
        <result column="labelName" property="labelName"/>
    </resultMap>

    <select id="selectItemParameterBySample" resultType="com.ruoyi.basic.pojo.StructureItemParameter">
@@ -217,7 +218,7 @@
    </select>

    <select id="getItemTreeProduct" resultMap="itemDto">
        select sto.id sId, sto.specimen_name sName, p.id pId, p.name pName
        select sto.id sId, sto.specimen_name sName, p.name labelName, p.id pId, p.name pName
        from structure_test_object sto
                 left join product p on p.object_id = sto.id
        WHERE sto.object_type = #{objectType}

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java

@@ -89,36 +89,40 @@
        RawMaterialStandardTreeDto rawMaterialStandardTreeDto = new RawMaterialStandardTreeDto();
        for (FactoryDto factoryDto : factoryDtos) {
            for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
                for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
                    if (sampleTypeDto.getChildren().size() == 0) {
                        sampleTypeDto.setChildren(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
                    }
                    // åˆ¤æ–­ç»‘定的是否是当前零件号
                    if (sampleTypeDto.getPartNo() != null && sampleTypeDto.getPartNo().equals(partNo)) {
                        // æ·»åŠ å¯¹è±¡
                        rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
                                + laboratoryDto.getValue() + "-"
                                + sampleTypeDto.getValue());
                        rawMaterialStandardTreeDto.setCode(sampleTypeDto.getCode());
                        rawMaterialStandardTreeDto.setLabel(sampleTypeDto.getLabel());
                        rawMaterialStandardTreeDto.setValue(sampleTypeDto.getValue());
                        rawMaterialStandardTreeDto.setChildren1(sampleTypeDto.getChildren());
                        rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
                        rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
                    } else {
                        for (SampleDto sampleDto : sampleTypeDto.getChildren()) {
                            if (sampleDto.getPartNo() != null && sampleDto.getPartNo().equals(partNo)) {
                for (ObjectTypeDto objectTypeDto : laboratoryDto.getChildren()) {
                    for (WorkShopNameDto workShopNameDto : objectTypeDto.getChildren()) {
                        for (SampleTypeDto sampleTypeDto : workShopNameDto.getChildren()) {
                            if (sampleTypeDto.getChildren().size() == 0) {
                                sampleTypeDto.setChildren(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
                            }
                            // åˆ¤æ–­ç»‘定的是否是当前零件号
                            if (sampleTypeDto.getPartNo() != null && sampleTypeDto.getPartNo().equals(partNo)) {
                                // æ·»åŠ å¯¹è±¡
                                rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
                                        + laboratoryDto.getValue() + "-"
                                        + sampleTypeDto.getValue() + "-"
                                        + sampleDto.getValue());
                                rawMaterialStandardTreeDto.setCode(sampleDto.getCode());
                                rawMaterialStandardTreeDto.setLabel(sampleDto.getLabel());
                                rawMaterialStandardTreeDto.setValue(sampleDto.getValue());
                                rawMaterialStandardTreeDto.setChildren2(sampleDto.getChildren());
                                        + laboratoryDto.getValue() + "-" + objectTypeDto.getValue() + "-" + workShopNameDto.getValue() + "-"
                                        + sampleTypeDto.getValue());
                                rawMaterialStandardTreeDto.setCode(sampleTypeDto.getCode());
                                rawMaterialStandardTreeDto.setLabel(sampleTypeDto.getLabel());
                                rawMaterialStandardTreeDto.setValue(sampleTypeDto.getValue());
                                rawMaterialStandardTreeDto.setChildren1(sampleTypeDto.getChildren());
                                rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
                                rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
                            } else {
                                for (SampleDto sampleDto : sampleTypeDto.getChildren()) {
                                    if (sampleDto.getPartNo() != null && sampleDto.getPartNo().equals(partNo)) {
                                        // æ·»åŠ å¯¹è±¡
                                        rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
                                                + laboratoryDto.getValue() + "-" + objectTypeDto.getValue() + "-" + workShopNameDto.getValue() + "-"
                                                + sampleTypeDto.getValue() + "-"
                                                + sampleDto.getValue());
                                        rawMaterialStandardTreeDto.setCode(sampleDto.getCode());
                                        rawMaterialStandardTreeDto.setLabel(sampleDto.getLabel());
                                        rawMaterialStandardTreeDto.setValue(sampleDto.getValue());
                                        rawMaterialStandardTreeDto.setChildren2(sampleDto.getChildren());
                                        rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
                                        rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
                                    }
                                }
                            }
                        }
                    }
@@ -141,6 +145,7 @@

    /**
     * æŠ¥æ£€
     *
     * @param ids
     * @return
     */
@@ -184,6 +189,7 @@

    /**
     * æ’¤é”€æŠ¥æ£€
     *
     * @param id
     * @return
     */
@@ -197,6 +203,7 @@

    /**
     * æ‰“印标签查询
     *
     * @param ids
     * @return
     */
@@ -207,6 +214,7 @@

    /**
     * æŠ¥æ£€
     *
     * @param ifsInventoryQuantity
     * @return
     */
@@ -237,6 +245,7 @@

    /**
     * èŽ·å–铜产业链检测数据
     *
     * @param id
     * @return
     */
@@ -247,6 +256,7 @@

    /**
     * åŽŸææ–™æ’¤é”€æŽ¥å£
     *
     * @param ifsInventoryId
     * @return
     */
@@ -273,6 +283,7 @@

    /**
     * åŽŸææ–™å…æ£€ä¸‹å•
     *
     * @param list
     * @param insOrder
     * @return
@@ -349,6 +360,7 @@

    /**
     * æŸ¥è¯¢å¾…下单
     *
     * @param page
     * @param ifsInventoryQuantity
     * @return
@@ -360,6 +372,7 @@

    /**
     * æŸ¥è¯¢å·²æ£€éªŒ
     *
     * @param page
     * @param ifsInventoryQuantityDto
     * @return
@@ -378,6 +391,7 @@

    /**
     * åˆ é™¤åŽŸææ–™æŠ¥æ£€ä¿¡æ¯
     *
     * @param id
     * @return
     */
@@ -388,6 +402,7 @@

    /**
     * åŽŸææ–™æ”¾è¡Œå…æ£€
     *
     * @param ifsInventoryId
     * @return
     */
@@ -441,8 +456,9 @@

    /**
     * 0, æ— æç¤º, 1提示  å½“前批次的样品已检验过, å¯ä»¥å…æ£€, 2 æç¤º å½“前批次的样品已超20吨, éœ€è¦å¤šçº§å¤šæ¬¡æ£€éªŒ
     *
     * <p>
     * åŽŸææ–™ä¸‹å•é€šçŸ¥å…æ£€æˆ–者多次检验
     *
     * @param ifsInventoryId
     * @return
     */
@@ -482,6 +498,7 @@

    /**
     * æŠ¥æ£€å¯ä»¥æ–°å¢žæŠ¥æ£€ä¿¡æ¯
     *
     * @param ifsInventoryQuantity
     */
    @Override
@@ -493,10 +510,9 @@
    }




    /**
     * é“œå•ä¸ä¸‹å•å…æ£€
     *
     * @param list
     * @param insOrder
     */
@@ -593,6 +609,7 @@

    /**
     * åŽŸææ–™è¿›åŽ‚撤销下单
     *
     * @param enterOrderId
     * @return
     */
@@ -631,6 +648,7 @@

    /**
     * åŽŸææ–™å­£åº¦æ’¤é”€ä¸‹å•
     *
     * @param quarterOrderId
     * @return
     */
@@ -671,6 +689,7 @@

    /**
     * åŽŸææ–™æŠ¥æ£€å…¨éƒ¨ä¿¡æ¯å¯¼å‡º
     *
     * @param ifsInventoryQuantityDto
     * @param response
     */
@@ -733,6 +752,7 @@

    /**
     * åŽŸææ–™æŸ¥è¯¢å¯ä»¥å­£åº¦æ£€éªŒçš„内容
     *
     * @param page
     * @param ifsInventoryQuantityDto
     * @return
@@ -751,6 +771,7 @@

    /**
     * æå‰å…¥åº“
     *
     * @param ifsInventoryId
     * @return
     */
@@ -778,6 +799,7 @@

    /**
     * æ·»åŠ å·¥æ—¶
     *
     * @param insOrder
     * @param ifsInventoryQuantity
     */