From b7e182815b09fbba8cb450ead0031fae820cad14 Mon Sep 17 00:00:00 2001 From: guoyuji <guoyujie@ng.com> Date: 星期四, 23 五月 2024 08:32:53 +0800 Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override --- north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java index adc050d..d95100b 100644 --- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java +++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java @@ -6,17 +6,22 @@ import com.example.erp.entity.pp.DamageDetails; import com.example.erp.entity.pp.FlowCard; import com.example.erp.entity.pp.Report; +import com.example.erp.entity.sd.Order; import com.example.erp.entity.sd.OrderDetail; import com.example.erp.entity.sd.OrderGlassDetail; import com.example.erp.exception.ServiceException; import com.example.erp.service.pp.ReportService; import com.example.erp.service.pp.WorkOrderService; +import com.example.erp.tools.DownExcel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.sql.Date; +import java.time.LocalDate; import java.util.List; import java.util.Map; @@ -153,4 +158,11 @@ @RequestBody Report report){ return Result.seccess(reportService.rawMaterialRequisitionSv(selectTime1,selectTime2,report)); } + @ApiOperation("璺ㄥ伐搴忔鐮存姤琛ㄥ鍑�") + @PostMapping("/exportCrossProcessBreaking") + public void exportCrossProcessBreaking(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException { + + //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧 + DownExcel.download(response, DamageDetails.class, reportService.exportCrossProcessBreakingSv(dates),"CrossProcessBreaking"); + } } -- Gitblit v1.8.0