Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

2 天以前 83f6a929a4a9ee2f67cfa6dd7d059c998380141d

 src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java

@@ -53,6 +53,9 @@
    @Log(title = "合并生产计划", businessType = BusinessType.INSERT)
    @ApiOperation("合并生产计划")
    public AjaxResult combine(@RequestBody ProductionPlanDto productionPlanDto) {
       if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
            return AjaxResult.error("请选择要下发的生产计划");
        }
        return AjaxResult.success(productionPlanService.combine(productionPlanDto));
    }

@@ -67,7 +70,7 @@
    @Log(title = "更新生产计划", businessType = BusinessType.UPDATE)
    @ApiOperation("更新生产计划")
    public AjaxResult update(@RequestBody ProductionPlanDto productionPlanDto) {
        return AjaxResult.success(productionPlanService.updateById(productionPlanDto));
        return AjaxResult.success(productionPlanService.update(productionPlanDto));
    }

    @DeleteMapping("")