Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

7 天以前 5ad54547dc97b76dc3d689b9499dec7364968235

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

@@ -14,6 +14,7 @@
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -85,10 +86,10 @@
        excelUtil.importTemplateExcel(response, "主生产计划导入模板");
    }

    @PostMapping("/import")
    @PostMapping(value = "/import", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(summary = "主生产计划数据导入")
    @Log(title = "主生产计划数据导入", businessType = BusinessType.IMPORT)
    public R importProdData(@RequestParam("file") MultipartFile file) {
    public R importProdData(@RequestPart("file") MultipartFile file) {
        productionPlanService.importProdData(file);
        return R.ok("导入成功");
    }
@@ -96,8 +97,8 @@
    @PostMapping("/export")
    @Operation(summary = "主生产计划数据导出")
    @Log(title = "主生产计划数据导出", businessType = BusinessType.EXPORT)
    public void exportProdData(HttpServletResponse response, @RequestBody(required = false) List<Long> ids) {
        productionPlanService.exportProdData(response, ids);
    public void exportProdData(HttpServletResponse response, @RequestBody(required = false) ProductionPlanDto requestDto) {
        productionPlanService.exportProdData(response, requestDto);
    }

}