From 1dc4dc1b5e5e734e5af915c40a48a0d5b0e4127a Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Mon, 11 Nov 2024 10:58:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=20?= =?UTF-8?q?=E5=8F=8A=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan/controller/ExportController.java | 43 +++++- .../plan/controller/PlanOutController.java | 3 +- .../plan/entity/ProNeedInfoExport.java | 128 ++++++++++++++++++ .../business/plan/mapper/PlanOutMapper.java | 2 +- .../business/plan/service/PlanOutService.java | 2 +- .../plan/service/PlanOutServiceImpl.java | 8 +- .../resources/mappers/plan/PlanOutMapper.xml | 4 +- 7 files changed, 175 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/bonus/gzgqj/business/plan/entity/ProNeedInfoExport.java diff --git a/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java b/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java index 43bab5f..a89765c 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java @@ -3,10 +3,7 @@ package com.bonus.gzgqj.business.plan.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import com.bonus.gzgqj.business.plan.entity.PlanApplyBean; -import com.bonus.gzgqj.business.plan.entity.PlanDataDetailBean; -import com.bonus.gzgqj.business.plan.entity.ProNeedInfo; -import com.bonus.gzgqj.business.plan.entity.ProPlanInfoVo; +import com.bonus.gzgqj.business.plan.entity.*; import com.bonus.gzgqj.business.plan.service.PlanApplicationService; import com.bonus.gzgqj.business.plan.service.PlanOutService; import com.bonus.gzgqj.business.utils.FileUploadService; @@ -15,6 +12,7 @@ import com.bonus.gzgqj.manager.webResult.StringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -143,9 +141,16 @@ public class ExportController { @PostMapping("exportAllFhList") public void exportAllFhList(HttpServletRequest request, HttpServletResponse response, ProNeedInfo o) { try { - List list = service.getPorInfoDetail2(o);; + List list = service.getPorInfoDetail2(o); + List exports=new ArrayList<>(); + list.forEach(vo->{ + ProNeedInfoExport voo=new ProNeedInfoExport(); + BeanUtils.copyProperties(vo, voo); + exports.add(voo); + }); + ExportParams exportParams = new ExportParams("全部发货", "全部发货", ExcelType.XSSF); - Workbook workbook = ExcelExportUtil.exportExcel(exportParams, PlanApplyBean.class, list); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, PlanApplyBean.class, exports); response.setContentType("application/vnd.ms-excel"); response.setHeader("content-disposition", "attachment;fileName=" + URLEncoder.encode("全部发货" + ".xlsx", "UTF-8")); ServletOutputStream outputStream = response.getOutputStream(); @@ -159,6 +164,32 @@ public class ExportController { + /** + * 导出 全部发货 -批次 + * @param request + * @param response + * @param o + */ + @PostMapping("exportPcList") + public void exportPcList(HttpServletRequest request, HttpServletResponse response, ProNeedInfo o) { + try { + List list = service.getOutDetailList(o); + + + + ExportParams exportParams = new ExportParams("全部发货", "全部发货", ExcelType.XSSF); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, PlanApplyBean.class, list); + response.setContentType("application/vnd.ms-excel"); + response.setHeader("content-disposition", "attachment;fileName=" + URLEncoder.encode("全部发货" + ".xlsx", "UTF-8")); + ServletOutputStream outputStream = response.getOutputStream(); + workbook.write(outputStream); + outputStream.close(); + workbook.close(); + } catch (Exception e) { + log.error(e.toString(), e); + } + } + diff --git a/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java b/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java index 4dd6897..4be6a00 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java @@ -145,7 +145,8 @@ public class PlanOutController { @DecryptAndVerify(decryptedClass = ProNeedInfo.class) public PageInfo getOutDetailList(EncryptedReq dto) { PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); - PageInfo pageInfo = service.getOutDetailList(dto.getData());; + List list = service.getOutDetailList(dto.getData());; + PageInfo pageInfo = new PageInfo<>(list); return pageInfo; } /** diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/ProNeedInfoExport.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/ProNeedInfoExport.java new file mode 100644 index 0000000..6cc98cf --- /dev/null +++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/ProNeedInfoExport.java @@ -0,0 +1,128 @@ +package com.bonus.gzgqj.business.plan.entity; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 工程需要数据 + * @author 黑子 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class ProNeedInfoExport extends PageInfo { + /** + * 主键 + */ + @Excel(name = "序号", width = 10.0, orderNum = "0") + private String id; + /** + * 计划内外 + */ + private String typeName; + /** + * 工程id + */ + private String proId; + + /** + * 工程名称 + */ + private String proName; + /** + * 类型 + */ + @Excel(name = "物机类型", width = 10.0,height = 20.0, orderNum = "3") + private String type; + /** + * 名称 + */ + @Excel(name = "物机名称", width = 10.0,height = 20.0, orderNum = "4") + private String name; + /** + * 规格型号 + */ + @Excel(name = "规格型号", width = 10.0,height = 20.0, orderNum = "5") + private String module; + + /** + * 单位 + */ + @Excel(name = "单位", width = 10.0,height = 20.0, orderNum = "6") + private String unit; + + /** + * 进度 + */ + private String progress; + /** + * 规格id + */ + private String moduleId; + /** + * 需求类型 1计划 2新增 + */ + private String needType; + + + + /** + * 需要数量 + */ + @Excel(name = "需要量", width = 10.0,height = 20.0, orderNum = "8") + private int needNum; + /** + * 发货数量 + */ + @Excel(name = "本次发货量", width = 10.0,height = 20.0, orderNum = "9") + private int fhNum; + /** + * 差额 + */ + private int diff; + + /** + * 调整量 + */ + @Excel(name = "不发货量", width = 10.0,height = 20.0, orderNum = "11") + private int tzNum; + /** + * 备注 + */ + @Excel(name = "备注", width = 10.0,height = 20.0, orderNum = "12") + private String remarks; + + + /** + * 备注 + */ + private String outId; + + /** + * 数据源 1 计划 2 新增 + */ + private String dataType; + + + /** + * 调整数量 + */ + private int num; + + + /** + * 计划数量 + */ + private String planNum; + /** + * 工程数量 + */ + private String proNum; + + /** + * 工程数量 + */ + private String typeSource; + + +} diff --git a/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java b/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java index 072e908..cf2ba92 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java @@ -167,7 +167,7 @@ public interface PlanOutMapper { * @param data * @return */ - PlanApplyBean getDataInfoDetails(PlanApplyBean data); + ProNeedInfo getDataInfoDetails(PlanApplyBean data); /** * 超库存量 diff --git a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java index ee5815f..118bf5d 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java @@ -74,7 +74,7 @@ public interface PlanOutService { * @param data * @return */ - PageInfo getOutDetailList(ProNeedInfo data); + List getOutDetailList(ProNeedInfo data); /** * diff --git a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java index 7c40af9..0fb6c9d 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java @@ -96,15 +96,15 @@ public class PlanOutServiceImpl implements PlanOutService{ * @return */ @Override - public PageInfo getOutDetailList(ProNeedInfo data) { + public List getOutDetailList(ProNeedInfo data) { List list = new ArrayList<>(); try { list = mapper.getOutDetailList(data); } catch (Exception e) { log.error(e.toString(),e); } - PageInfo pageInfo = new PageInfo<>(list); - return pageInfo; + + return list; } /** @@ -471,7 +471,7 @@ public class PlanOutServiceImpl implements PlanOutService{ @Override public ServerResponse getDataInfoDetails(PlanApplyBean data) { try { - PlanApplyBean bean=mapper.getDataInfoDetails(data); + ProNeedInfo bean=mapper.getDataInfoDetails(data); return ServerResponse.createSuccess(bean); }catch (Exception e) { log.error(e.toString(), e); diff --git a/src/main/resources/mappers/plan/PlanOutMapper.xml b/src/main/resources/mappers/plan/PlanOutMapper.xml index 29bf112..dcb45e7 100644 --- a/src/main/resources/mappers/plan/PlanOutMapper.xml +++ b/src/main/resources/mappers/plan/PlanOutMapper.xml @@ -287,8 +287,8 @@ - + select pni.id,pni.type,pni.name,pni.module,pni.module_id moduleId,pni.need_num needNum,pni.fh_num,pni.tz_num tzNum, pro.num proNum,plan.num planNum,pni.unit from t_pro_need_info pni LEFT JOIN(