成品复测功能修改

chenrui

2025-04-10 2f467298075f6eb3bc40ecfa6da88c009f7fd0f8

成品复测功能修改

 cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java

@@ -215,4 +215,10 @@
        }
        return Result.success();
    }

    @ApiOperation(value = "判断该设备是否可以数采")
    @GetMapping("/determineWhetherToCollectData")
    public Result<?> determineWhetherToCollectData(@RequestParam(value = "managementNumber",defaultValue = "") String managementNumber, HttpServletRequest request) {
        return deviceService.determineWhetherToCollectData(managementNumber, request);
    }
}

 cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java

@@ -62,4 +62,12 @@
     * @return
     */
    void importExcel(List<Device> list);

    /**
     * åˆ¤æ–­è¯¥è®¾å¤‡æ˜¯å¦å¯ä»¥æ•°é‡‡
     * @param managementNumber
     * @param request
     * @return
     */
    Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request);
}

 cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java

@@ -533,6 +533,27 @@
        batchOperate(toInsert, toUpdate);
    }

    /**
     * åˆ¤æ–­è¯¥è®¾å¤‡æ˜¯å¦å¯ä»¥æ•°é‡‡
     * @param managementNumber
     * @param request
     * @return
     */
    @Override
    public Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request) {
        String ip = DataAcquisition.getIp(request);
        List<Device> device = baseMapper.selectList(Wrappers.<Device>lambdaQuery()
                .eq(Device::getIp, ip));
        if (ObjectUtils.isEmpty(device)) {
            return Result.success(false);
        }
        if (ObjectUtils.isEmpty(device.get(0).getFileType()) || ObjectUtils.isEmpty(device.get(0).getCollectUrl())) {
            return Result.success(false);
        } else {
            return Result.success(true);
        }
    }

    private Map<String, Integer> queryUserMap(List<Device> batch) {
        Set<String> managerNames = batch.stream()
                .map(Device::getEquipmentManagerName)

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java

@@ -5,10 +5,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.dto.InsOrderPlanDTO;
import com.ruoyi.inspect.dto.InsOrderPlanProductDto;
import com.ruoyi.inspect.dto.InsProductBindingDto;
import com.ruoyi.inspect.dto.SaveInsContextDto;
import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
import com.ruoyi.inspect.pojo.InsOrderFile;
@@ -199,18 +196,14 @@

    /**
     *
     * @param param æ¨¡æ¿å†…容
     * @param currentTable å½“前模板id
     * @param sampleId å½“前样品id
     * @param orderId å½“前订单id
     * @param sonLaboratory å­è¯•éªŒå®¤
     * @param insUnqualifiedRetestResultDto
     * @return
     */
    @ApiOperation(value = "保存不合格复测检验内容")
    @PostMapping("/saveUnqualifiedContext")
    public Result<?> saveUnqualifiedContext(String param, Integer currentTable, Integer sampleId, Integer orderId, String sonLaboratory) {
        Map<String, Object> param2 = JSON.parseObject(param, Map.class);
        insOrderPlanService.saveUnqualifiedContext(param2, currentTable, sampleId, orderId, sonLaboratory);
    public Result<?> saveUnqualifiedContext(@RequestBody InsUnqualifiedRetestResultDto insUnqualifiedRetestResultDto) {
        Map<String, Object> param2 = JSON.parseObject(insUnqualifiedRetestResultDto.getParam(), Map.class);
        insOrderPlanService.saveUnqualifiedContext(param2, insUnqualifiedRetestResultDto.getCurrentTable(), insUnqualifiedRetestResultDto.getSampleId(), insUnqualifiedRetestResultDto.getOrderId(), insUnqualifiedRetestResultDto.getSonLaboratory());
        return Result.success();
    }


 inspect-server/src/main/java/com/ruoyi/inspect/dto/InsUnqualifiedRetestResultDto.java

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

import lombok.Data;

@Data
public class InsUnqualifiedRetestResultDto {

    /**
     * æ¨¡æ¿å†…容
     */
    private String param;

    /**
     * å½“前模板id
     */
    private Integer currentTable;

    /**
     * å½“前样品id
     */
    private Integer sampleId;

    /**
     * å½“前订单id
     */
    private Integer orderId;

    /**
     * å­è¯•éªŒå®¤
     */
    private String sonLaboratory;
}

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

@@ -46,6 +46,7 @@
        <result property="temperature" column="temperature"/>
        <result property="humidity" column="humidity"/>
        <result property="cableTag" column="cable_tag"/>
        <result property="sort" column="sort"/>
        <collection property="insProductResult" resultMap="insProductResult"/>
    </resultMap>

@@ -100,7 +101,8 @@
               ip.method_s,
               ip.tell,
               ip.dic,
               ip.cable_tag
               ip.cable_tag,
               ip.sort
       </sql>

    <select id="selectRetestProduct" resultType="com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct">
@@ -169,7 +171,9 @@
              and ins_fibers_id is null
              and standard_method_list_id is not null
              and ip.cable_tag is null
              and ip.retest_tag = #{retestTag}
              <if test="retestTag != null and retestTag != ''">
                  and ip.retest_tag = #{retestTag}
              </if>
       </select>
       <select id="getInsProductUnqualifiedRetest5" resultMap="product">
           select <include refid="getInsProducSql"/>