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

chenrui

2025-04-08 9f8f73240c885488fdffc1062826520cf7abb86b

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

@@ -89,32 +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());
                    } 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());
                                    }
                                }
                            }
                        }
                    }
@@ -137,6 +145,7 @@

    /**
     * 报检
     *
     * @param ids
     * @return
     */
@@ -180,6 +189,7 @@

    /**
     * 撤销报检
     *
     * @param id
     * @return
     */
@@ -193,6 +203,7 @@

    /**
     * 打印标签查询
     *
     * @param ids
     * @return
     */
@@ -203,6 +214,7 @@

    /**
     * 报检
     *
     * @param ifsInventoryQuantity
     * @return
     */
@@ -233,6 +245,7 @@

    /**
     * 获取铜产业链检测数据
     *
     * @param id
     * @return
     */
@@ -243,6 +256,7 @@

    /**
     * 原材料撤销接口
     *
     * @param ifsInventoryId
     * @return
     */
@@ -269,6 +283,7 @@

    /**
     * 原材料免检下单
     *
     * @param list
     * @param insOrder
     * @return
@@ -345,6 +360,7 @@

    /**
     * 查询待下单
     *
     * @param page
     * @param ifsInventoryQuantity
     * @return
@@ -356,6 +372,7 @@

    /**
     * 查询已检验
     *
     * @param page
     * @param ifsInventoryQuantityDto
     * @return
@@ -374,6 +391,7 @@

    /**
     * 删除原材料报检信息
     *
     * @param id
     * @return
     */
@@ -384,6 +402,7 @@

    /**
     * 原材料放行免检
     *
     * @param ifsInventoryId
     * @return
     */
@@ -437,8 +456,9 @@

    /**
     * 0, 无提示, 1提示  当前批次的样品已检验过, 可以免检, 2 提示 当前批次的样品已超20吨, 需要多级多次检验
     *
     * <p>
     * 原材料下单通知免检或者多次检验
     *
     * @param ifsInventoryId
     * @return
     */
@@ -478,6 +498,7 @@

    /**
     * 报检可以新增报检信息
     *
     * @param ifsInventoryQuantity
     */
    @Override
@@ -489,10 +510,9 @@
    }




    /**
     * 铜单丝下单免检
     *
     * @param list
     * @param insOrder
     */
@@ -589,6 +609,7 @@

    /**
     * 原材料进厂撤销下单
     *
     * @param enterOrderId
     * @return
     */
@@ -627,6 +648,7 @@

    /**
     * 原材料季度撤销下单
     *
     * @param quarterOrderId
     * @return
     */
@@ -667,6 +689,7 @@

    /**
     * 原材料报检全部信息导出
     *
     * @param ifsInventoryQuantityDto
     * @param response
     */
@@ -729,6 +752,7 @@

    /**
     * 原材料查询可以季度检验的内容
     *
     * @param page
     * @param ifsInventoryQuantityDto
     * @return
@@ -747,6 +771,7 @@

    /**
     * 提前入库
     *
     * @param ifsInventoryId
     * @return
     */
@@ -774,6 +799,7 @@

    /**
     * 添加工时
     *
     * @param insOrder
     * @param ifsInventoryQuantity
     */