成品复测功能修改

chenrui

2025-04-10 2f467298075f6eb3bc40ecfa6da88c009f7fd0f8

 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;
@@ -17,6 +14,7 @@
import com.ruoyi.inspect.service.InsOrderPlanService;
import com.ruoyi.inspect.service.InsOrderRatesService;
import com.ruoyi.inspect.service.InsProductService;
import com.ruoyi.performance.dto.AuxiliaryOutputWorkingHoursTemporaryDto;
import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;
import com.ruoyi.performance.service.AuxiliaryOutputWorkingHoursTemporaryService;
import io.swagger.annotations.Api;
@@ -198,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();
    }

@@ -274,7 +268,7 @@
    @ApiOperation(value = "根据订单查询工时详情")
    @PreAuthorize("@ss.hasPermi('get:working:hours:byOrder')")
    @GetMapping("/getWorkingHoursByOrderId")
    public Result<IPage<AuxiliaryOutputWorkingHoursTemporary>> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporary workingHoursTemporary) {
    public Result<IPage<AuxiliaryOutputWorkingHoursTemporaryDto>> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporaryDto workingHoursTemporary) {
        return Result.success(auxiliaryOutputWorkingHoursTemporaryService.getWorkingHoursByOrderId(page, workingHoursTemporary));
    }