Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

chenhj

2026-04-24 8b749305a8e8c3f4bf669f6980edf2bbb7bfa9c7

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

@@ -10,8 +10,8 @@
import com.ruoyi.production.bean.dto.ProductionPlanImportDto;
import com.ruoyi.production.bean.vo.ProductionPlanVo;
import com.ruoyi.production.service.ProductionPlanService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -31,20 +31,20 @@
@RestController
@RequestMapping("/productionPlan")
@RequiredArgsConstructor
@Api(tags = "主生产计划")
@Tag(name = "主生产计划")
public class ProductionPlanController {

    private final ProductionPlanService productionPlanService;

    @GetMapping("/listPage")
    @ApiOperation("获取生产计划列表")
    @Operation(summary = "获取生产计划列表")
    public R<IPage<ProductionPlanVo>> productionPlanListPage(Page<ProductionPlanDto> page, ProductionPlanDto productionPlanDto) {
        return R.ok(productionPlanService.listPage(page, productionPlanDto));
    }

    @PostMapping("/combine")
    @Log(title = "合并生产计划", businessType = BusinessType.INSERT)
    @ApiOperation("合并生产计划")
    @Operation(summary = "合并生产计划")
    public R combine(@RequestBody ProductionPlanDto productionPlanDto) {
        if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
            return R.fail("请选择要下发的生产计划");
@@ -58,35 +58,35 @@

    @PostMapping("addProductionPlan")
    @Log(title = "创建生产计划", businessType = BusinessType.INSERT)
    @ApiOperation("创建生产计划")
    @Operation(summary = "创建生产计划")
    public R add(@RequestBody ProductionPlanDto productionPlanDto) {
        return R.ok(productionPlanService.add(productionPlanDto));
    }

    @PutMapping("updateProductionPlan")
    @Log(title = "更新生产计划", businessType = BusinessType.UPDATE)
    @ApiOperation("更新生产计划")
    @Operation(summary = "更新生产计划")
    public R update(@RequestBody ProductionPlanDto productionPlanDto) {
        return R.ok(productionPlanService.update(productionPlanDto));
    }

    @DeleteMapping("deleteProductionPlan")
    @Log(title = "删除生产计划", businessType = BusinessType.DELETE)
    @ApiOperation("删除生产计划")
    @Operation(summary = "删除生产计划")
    public R delete(@RequestBody List<Long> ids) {
        return R.ok(productionPlanService.removeByIds(ids));
        return R.ok(productionPlanService.delete(ids));
    }

    @PostMapping("/downloadTemplate")
    @Log(title = "下载主生产计划导入模板", businessType = BusinessType.EXPORT)
    @ApiOperation("下载主生产计划导入模板")
    @Operation(summary = "下载主生产计划导入模板")
    public void importTemplate(HttpServletResponse response) {
        ExcelUtil<ProductionPlanImportDto> excelUtil = new ExcelUtil<>(ProductionPlanImportDto.class);
        excelUtil.importTemplateExcel(response, "主生产计划导入模板");
    }

    @PostMapping("/import")
    @ApiOperation("主生产计划数据导入")
    @Operation(summary = "主生产计划数据导入")
    @Log(title = "主生产计划数据导入", businessType = BusinessType.IMPORT)
    public R importProdData(@RequestParam("file") MultipartFile file) {
        productionPlanService.importProdData(file);
@@ -94,7 +94,7 @@
    }

    @PostMapping("/export")
    @ApiOperation("主生产计划数据导出")
    @Operation(summary = "主生产计划数据导出")
    @Log(title = "主生产计划数据导出", businessType = BusinessType.EXPORT)
    public void exportProdData(HttpServletResponse response, @RequestBody(required = false) List<Long> ids) {
        productionPlanService.exportProdData(response, ids);