业务代码合并

zhuo

2025-05-20 61f34419e094f2363276d614a960b379cc456482

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

@@ -17,6 +17,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;
@@ -113,8 +114,7 @@
    @ApiOperation(value = "保存检验内容")
    @PostMapping("/saveInsContext")
    public Result<?> saveInsContext(@RequestBody SaveInsContextDto saveInsContextDto) {
        Map<String, Object> param2 = JSON.parseObject(saveInsContextDto.getParam(), Map.class);
        insOrderPlanService.saveInsContext(param2, saveInsContextDto.getCurrentTable(), saveInsContextDto.getSampleId(), saveInsContextDto.getOrderId(), saveInsContextDto.getSonLaboratory());
        insOrderPlanService.saveInsContext(saveInsContextDto);
        return Result.success();
    }

@@ -176,40 +176,27 @@
        return Result.success(insOrderPlanService.getRepetitionTag(id, laboratory, cableTag));
    }

    @ApiOperation("获取不合格数据")
    @GetMapping("/getInsProductUnqualified")
    public Result<?> getInsProductUnqualified(InsOrderPlanProductDto insOrderPlanProductDto) {
        return Result.success(insOrderPlanService.getInsProductUnqualified(insOrderPlanProductDto));
    }

    @ApiOperation("新增不合格复测信息")
    @PostMapping("/addUnqualifiedRetest")
    public Result<?> addDisqualificationRetest(@RequestBody Map<String, Object> params) {
        // 获取检验对象的id
        List<Integer> ids = (List<Integer>) params.get("ids");
        return Result.success(insOrderPlanService.addDisqualificationRetest(ids));
    public Result<?> addDisqualificationRetest(@RequestBody List<InsProduct> insProductsList) {
        return Result.success(insOrderPlanService.addDisqualificationRetest(insProductsList));
    }

    @ApiOperation("获取不合格复测数据")
    @GetMapping("/getInsProductUnqualifiedRetest")
    public Result<?> getInsProductUnqualifiedRetest(Integer id, Integer type, String laboratory, String cableTag, String rawMaterialTag, String retestTag) {
        return Result.success(insOrderPlanService.getInsProductUnqualifiedRetest(id, type, laboratory, cableTag, rawMaterialTag, retestTag));
    public Result<?> getInsProductUnqualifiedRetest(InsOrderPlanProductDto insOrderPlanProductDto) {
        return Result.success(insOrderPlanService.getInsProductUnqualifiedRetest(insOrderPlanProductDto));
    }

    /**
     *
     * @param param 模板内容
     * @param currentTable 当前模板id
     * @param sampleId 当前样品id
     * @param orderId 当前订单id
     * @param sonLaboratory 子试验室
     * @return
     */
    @ApiOperation(value = "保存不合格复测检验内容")
    @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 SaveInsContextDto saveInsContextDto) {
        Map<String, Object> param2 = JSON.parseObject(saveInsContextDto.getParam(), Map.class);
        insOrderPlanService.saveUnqualifiedContext(param2, saveInsContextDto.getCurrentTable(), saveInsContextDto.getSampleId(), saveInsContextDto.getOrderId(), saveInsContextDto.getSonLaboratory());
        return Result.success();
    }

@@ -256,7 +243,8 @@
    @GetMapping("/getBindingProductByProductId")
    public Result<List<InsProduct>> getBindingProductByProductId(Integer productId) {
        return Result.success(insProductService.list(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getBindingProductId, productId)));
                .eq(InsProduct::getBindingProductId, productId)
                .orderByAsc(InsProduct::getSort)));
    }


@@ -274,7 +262,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));
    }