Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

4 天以前 cf7bc2d68e7d86e7d4b896acf1400f534d594daa

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

@@ -1,11 +1,11 @@
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;
@@ -36,4 +36,11 @@
    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();
    }
}