Commit e191dd30 authored by 温志超's avatar 温志超

暂存

parent 39e187b3
......@@ -6,6 +6,7 @@ import com.ximai.common.core.controller.BaseController;
import com.ximai.common.core.domain.AjaxResult;
import com.ximai.common.core.page.TableDataInfo;
import com.ximai.common.enums.BusinessType;
import com.ximai.common.utils.poi.ExcelUtil;
import com.ximai.mes.report.request.DailyProductionReportRequest;
import com.ximai.mes.report.request.FeedbackRequest;
import com.ximai.mes.report.response.FeedbackResponse;
......@@ -16,9 +17,11 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
......@@ -52,6 +55,16 @@ public class DailyProductionReportController extends BaseController {
return AjaxResult.success(data);
}
/**
* 明细界面导出
*/
@PreAuthorize("@ss.hasPermi('pro:materialReturn:export')")
@Log(title = "日产能对比统计:统计方式工序导出", businessType = BusinessType.EXPORT)
@PostMapping("/getListByProcess/export")
public void export(HttpServletResponse response, DailyProductionReportRequest dailyProductionReportRequest) {
List data = dailyProductionReportService.getListByProcess(dailyProductionReportRequest);
dailyProductionReportService.export(response,data,"日产能对比统计-统计方式工序导出","工序名称","工序编码","工序", dailyProductionReportRequest);
}
@ApiOperation("日产能对比统计:统计方式车间")
@PreAuthorize("@ss.hasPermi('mes:pro:dailyProductionReport:get')")
......
......@@ -2,6 +2,7 @@ package com.ximai.mes.report.service;
import com.ximai.mes.report.request.DailyProductionReportRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
......@@ -17,4 +18,6 @@ public interface DailyProductionReportService {
List getListByWorkunit(DailyProductionReportRequest dailyProductionReportRequest);
List getListByUser(DailyProductionReportRequest dailyProductionReportRequest);
public void export(HttpServletResponse response,List<Map> returnList,String filename,String name,String code,String key, DailyProductionReportRequest dailyProductionReportRequest);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment