合并下发生产计划

huminmin

3 天以前 adb589891e12a843601fdbd848bb8a6c107ec3b1

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

@@ -1,18 +1,18 @@
package com.ruoyi.productionPlan.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
import com.ruoyi.productionPlan.service.ProductionPlanService;
import com.ruoyi.productionPlan.service.impl.ProdDemandService;
import com.ruoyi.staff.dto.StaffLeaveDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * <br>
@@ -36,4 +36,17 @@
    public AjaxResult productionPlanListPage(Page page, ProductionPlanDto productionPlanDto) {
        return AjaxResult.success(productionPlanService.listPage(page, productionPlanDto));
    }

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

    @PostMapping("/combine")
    @Log(title = "合并生产计划", businessType = BusinessType.INSERT)
    public AjaxResult combine(@RequestBody ProductionPlanDto productionPlanDto) {
        return AjaxResult.success(productionPlanService.combine(productionPlanDto));
    }
}