原材料订单拆分功能v1

zouyu

2025-09-24 2bb12b1ca40b29b7edcf06ef3f3d6de24dde1c4c

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

@@ -103,19 +103,17 @@
        return Result.success(insOrderPlanService.checkSubmitPlan(orderId, laboratory));
    }


    @ApiOperation(value = "检验任务提交")
    @PostMapping("/submitPlan")
    public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode) {
        int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode);
    public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode,Boolean registerInsResults) {
        int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode,registerInsResults);
        return num == 1 ? Result.success() : Result.fail("提交失败，部分项目还未进行检验");
    }

    @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();
    }

@@ -177,40 +175,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();
    }

@@ -257,7 +242,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)));
    }