From 4e5f4c3a7ff215943fbbb4d71b85a23e673a660c Mon Sep 17 00:00:00 2001 From: wg <2023838292@qq.com> Date: Mon, 2 Dec 2024 09:14:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=87=E7=82=B9=E6=95=B0?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 5 +- .../ProductionReportController.java | 23 ++- .../aucma/report/domain/MaterialReport.java | 106 ++++++++++++ .../report/mapper/GeneralReportMapper.java | 5 + .../service/IProductionReportService.java | 4 + .../impl/ProductionReportServiceImpl.java | 8 +- .../mapper/report/GeneralReportMapper.xml | 151 +++++++++++++----- 7 files changed, 257 insertions(+), 45 deletions(-) create mode 100644 aucma-report/src/main/java/com/aucma/report/domain/MaterialReport.java diff --git a/aucma-admin/src/main/resources/application-dev.yml b/aucma-admin/src/main/resources/application-dev.yml index a98ae2d..e3c2074 100644 --- a/aucma-admin/src/main/resources/application-dev.yml +++ b/aucma-admin/src/main/resources/application-dev.yml @@ -39,13 +39,14 @@ spring: enabled: true # redis 配置 redis: - # 地址 - host: localhost + host: 175.27.215.92 # 端口，默认为6379 port: 6379 # 数据库索引 database: 5 # 密码 + password: redis@2023 + # 密码 # password: redis@2023 # 连接超时时间 timeout: 10s diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java index 22f51e2..73c6f18 100644 --- a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java +++ b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java @@ -254,6 +254,27 @@ public class ProductionReportController extends BaseController { ExcelUtil util = new ExcelUtil<>(codeBanding.class); util.exportExcel(response,list,"壳胆绑定报表"); } - + /** + * 过点数报表 + * */ + @GetMapping("/materialReportList") + public TableDataInfo materialReportList(@RequestParam(required = false) Map hashMap){ + startPage(); + List list = productionReportService.materialReportList(hashMap); + return getDataTable(list); + } + /** + * 查询过点数报表导出 + * */ + @PostMapping("/materialReportList/export") + public void materialReportListExport(HttpServletResponse response,@RequestParam(required = false) Map hashMap){ + hashMap.put("pageNum",null); + hashMap.put("pageSize",null); + List list = productionReportService.materialReportList(hashMap); + ExcelUtil util = new ExcelUtil<>(MaterialReport.class); + util.exportExcel(response,list,"物料报表"); + } } + + diff --git a/aucma-report/src/main/java/com/aucma/report/domain/MaterialReport.java b/aucma-report/src/main/java/com/aucma/report/domain/MaterialReport.java new file mode 100644 index 0000000..3a2154e --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/MaterialReport.java @@ -0,0 +1,106 @@ +package com.aucma.report.domain; + +import com.aucma.common.annotation.Excel; +import com.aucma.common.annotation.Log; +import com.aucma.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.Date; + +/** + * @ClassName : MaterialReport + * @Description : 报表数据实体类 + * @Author : [您的名字] + * @Date: 2024-11-25 11:30 + */ +public class MaterialReport extends BaseEntity { + private static final long serialVersionUID = 1L; + + @Excel(name = "产线名称") + @JsonProperty("PRODUCT_LINE_NAME") + private String PRODUCT_LINE_NAME; + + @Excel(name = "物料编号") + @JsonProperty("MATERIAL_CODE") + private String MATERIAL_CODE; + + @Excel(name = "物料名称") + @JsonProperty("MATERIAL_NAME") + private String MATERIAL_NAME; + + @Excel(name = "MES/SN绑定数量") + @JsonProperty("MES_SN_BINDING_COUNT") + private Integer MES_SN_BINDING_COUNT; + + @Excel(name = "成品下线扫描数量") + @JsonProperty("FINISHED_PRODUCT_SCAN_COUNT") + private Integer FINISHED_PRODUCT_SCAN_COUNT; + + @Excel(name = "成品库分垛数量") + @JsonProperty("FINISHED_PRODUCT_PILING_COUNT") + private Integer FINISHED_PRODUCT_PILING_COUNT; + @Excel(name = "过点时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonProperty("RECORD_TIME1") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String RECORD_TIME1; + public String getPRODUCT_LINE_NAME() { + return PRODUCT_LINE_NAME; + } + + public void setPRODUCT_LINE_NAME(String PRODUCT_LINE_NAME) { + this.PRODUCT_LINE_NAME = PRODUCT_LINE_NAME; + } + + public String getMATERIAL_CODE() { + return MATERIAL_CODE; + } + + public void setMATERIAL_CODE(String MATERIAL_CODE) { + this.MATERIAL_CODE = MATERIAL_CODE; + } + + public String getMATERIAL_NAME() { + return MATERIAL_NAME; + } + + public void setMATERIAL_NAME(String MATERIAL_NAME) { + this.MATERIAL_NAME = MATERIAL_NAME; + } + + public Integer getMES_SN_BINDING_COUNT() { + return MES_SN_BINDING_COUNT; + } + + public void setMES_SN_BINDING_COUNT(Integer MES_SN_BINDING_COUNT) { + this.MES_SN_BINDING_COUNT = MES_SN_BINDING_COUNT; + } + + public Integer getFINISHED_PRODUCT_SCAN_COUNT() { + return FINISHED_PRODUCT_SCAN_COUNT; + } + + public void setFINISHED_PRODUCT_SCAN_COUNT(Integer FINISHED_PRODUCT_SCAN_COUNT) { + this.FINISHED_PRODUCT_SCAN_COUNT = FINISHED_PRODUCT_SCAN_COUNT; + } + + public Integer getFINISHED_PRODUCT_PALLETIZING_COUNT() { + return FINISHED_PRODUCT_PILING_COUNT; + } + + public void setFINISHED_PRODUCT_PALLETIZING_COUNT(Integer FINISHED_PRODUCT_PALLETIZING_COUNT) { + this.FINISHED_PRODUCT_PILING_COUNT = FINISHED_PRODUCT_PALLETIZING_COUNT; + } + + @Override + public String toString() { + return "MaterialReport{" + + "PRODUCT_LINE_NAME='" + PRODUCT_LINE_NAME + '\'' + + ", MATERIAL_CODE='" + MATERIAL_CODE + '\'' + + ", MATERIAL_NAME='" + MATERIAL_NAME + '\'' + + ", MES_SN_BINDING_COUNT=" + MES_SN_BINDING_COUNT + + ", FINISHED_PRODUCT_SCAN_COUNT=" + FINISHED_PRODUCT_SCAN_COUNT + + ", FINISHED_PRODUCT_PALLETIZING_COUNT=" + FINISHED_PRODUCT_PILING_COUNT + + '}'; + } +} \ No newline at end of file diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java index 4afaafe..166bc7e 100644 --- a/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java +++ b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java @@ -183,4 +183,9 @@ public interface GeneralReportMapper { * 查询壳胆报表 * */ List codeBandingReportList(Map hashMap); + /** + * 查询过点数报表 + * */ + List materialReportList(Map hashMap); + } diff --git a/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java index 2bf5f43..0f5d9f4 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java +++ b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java @@ -81,4 +81,8 @@ public interface IProductionReportService * 查询壳胆绑定报表 * */ List codeBandingReportList(Map hashMap); + /** + * 查询过点数报表 + * */ + List materialReportList(Map hashMap); } diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java index 32b3da8..9ece00f 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java @@ -117,5 +117,11 @@ public class ProductionReportServiceImpl implements IProductionReportService { List codeBandings = reportMapper.codeBandingReportList(hashMap); return codeBandings; } - + /** + * 查询过点数报表 + * */ + public List materialReportList(Map hashMap){ + List Materials = reportMapper.materialReportList(hashMap); + return Materials; + } } diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml index dd3ea3e..b36bbd0 100644 --- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml @@ -638,49 +638,51 @@ ORDER BY MC.COMPLETE_DATE + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + +