fix:1.生产部分完善 2.生产计划部分更改

liding

2026-04-23 b2a081508aca058c075a7e6dcf980c52451093b6

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

@@ -12,11 +12,11 @@
import com.ruoyi.production.service.ProductionPlanService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;

@@ -42,14 +42,6 @@
        return R.ok(productionPlanService.listPage(page, productionPlanDto));
    }

    @GetMapping("/loadProdData")
    @ApiOperation("拉取销售生产计划")
    @Log(title = "拉取销售生产计划", businessType = BusinessType.INSERT)
    public R loadProdData() {
        productionPlanService.loadProdData();
        return R.ok();
    }

    @PostMapping("/combine")
    @Log(title = "合并生产计划", businessType = BusinessType.INSERT)
    @ApiOperation("合并生产计划")
@@ -64,21 +56,21 @@
        return R.ok(productionPlanService.combine(productionPlanDto));
    }

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

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

    @DeleteMapping("")
    @DeleteMapping("deleteProductionPlan")
    @Log(title = "删除生产计划", businessType = BusinessType.DELETE)
    @ApiOperation("删除生产计划")
    public R delete(@RequestBody List<Long> ids) {