Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro

liyong

2026-05-09 67fda7b2dfbfc9e6a8d8b9472499a67906d2bad1

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -14,6 +15,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;

@@ -53,6 +55,9 @@
        if (productionPlanDto.getTotalAssignedQuantity() == null || productionPlanDto.getTotalAssignedQuantity().compareTo(BigDecimal.ZERO) <= 0) {
            return R.fail("请输入下发数量");
        }
        if(productionPlanDto.getWorkshopId() == null){
            throw new BaseException("请选择车间信息");
        }
        return R.ok(productionPlanService.combine(productionPlanDto));
    }

@@ -85,10 +90,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 +101,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);
    }

}