From d0e058319ca8759587a9cf9178a9c966224de986 Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 19 Mar 2024 10:38:50 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=8F=91=E6=B3=A1=E8=BF=BD?= =?UTF-8?q?=E6=BA=AF=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductionReportController.java | 15 ++ .../report/domain/boxTraceabilityReport.java | 181 ++++++++++++++++++ .../report/mapper/GeneralReportMapper.java | 8 + .../service/IProductionReportService.java | 9 +- .../impl/ProductionReportServiceImpl.java | 10 + .../mapper/report/GeneralReportMapper.xml | 37 +++- 6 files changed, 258 insertions(+), 2 deletions(-) create mode 100644 aucma-report/src/main/java/com/aucma/report/domain/boxTraceabilityReport.java 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 e52acef..8098495 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 @@ -4,6 +4,8 @@ import com.aucma.common.core.controller.BaseController; import com.aucma.common.core.domain.AjaxResult; import com.aucma.common.core.page.TableDataInfo; +import com.aucma.report.domain.ProductTraceabilityReport; +import com.aucma.report.domain.boxTraceabilityReport; import com.aucma.report.service.IProductionReportService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -61,4 +63,17 @@ public class ProductionReportController extends BaseController { } + /** + * 发泡箱体追溯报表 + * @param hashMap + * @return + */ + @GetMapping("/boxTraceabilityReport") + public TableDataInfo boxTraceabilityReport(@RequestParam(required = false) Map hashMap) { + startPage(); + List list = productionReportService.boxTraceabilityReport(hashMap); + return getDataTable(list); + } + + } diff --git a/aucma-report/src/main/java/com/aucma/report/domain/boxTraceabilityReport.java b/aucma-report/src/main/java/com/aucma/report/domain/boxTraceabilityReport.java new file mode 100644 index 0000000..a66e177 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/boxTraceabilityReport.java @@ -0,0 +1,181 @@ +package com.aucma.report.domain; + +import com.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * 发泡箱体追溯报表 + * + * @author Yinq + * @date 2024-03-15 + */ +public class boxTraceabilityReport extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * SAP订单编号 + */ + @Excel(name = "SAP订单编号") + @JsonProperty("ORDER_CODE") + private String ORDER_CODE; + + /** + * 销售订单编号 + */ + @Excel(name = "销售订单编号") + @JsonProperty("SALEORDER_CODE") + private String SALEORDER_CODE; + + /** + * 销售订单行号 + */ + @Excel(name = "销售订单行号") + @JsonProperty("SALEORDER_LINENUMBER") + private String SALEORDER_LINENUMBER; + + /** + * 物料编号 + */ + @Excel(name = "物料编号") + @JsonProperty("MATERIAL_CODE") + private String MATERIAL_CODE; + + /** + * 产品型号 + */ + @Excel(name = "产品型号") + @JsonProperty("MATERIAL_MODEL") + private String MATERIAL_MODEL; + + /** + * 订单数 + */ + @Excel(name = "订单数") + @JsonProperty("ORDER_AMOUNT") + private Long ORDER_AMOUNT; + + /** + * 泡前入库数 + */ + @Excel(name = "泡前入库数") + @JsonProperty("BEFORE_NUMBER") + private Long BEFORE_NUMBER; + + /** + * 扫描下线数 + */ + @Excel(name = "扫描下线数") + @JsonProperty("SCAN_NUMBER") + private Long SCAN_NUMBER; + + /** + * 差异数 + */ + @Excel(name = "差异数") + @JsonProperty("DIFF_NUMBER") + private Long DIFF_NUMBER; + + /** + * 报废数 + */ + @Excel(name = "报废数") + @JsonProperty("SCRAP_NUMBER") + private Long SCRAP_NUMBER; + + public Long getDIFF_NUMBER() { + return DIFF_NUMBER; + } + + public void setDIFF_NUMBER(Long DIFF_NUMBER) { + this.DIFF_NUMBER = DIFF_NUMBER; + } + + public String getORDER_CODE() { + return ORDER_CODE; + } + + public void setORDER_CODE(String ORDER_CODE) { + this.ORDER_CODE = ORDER_CODE; + } + + public String getSALEORDER_LINENUMBER() { + return SALEORDER_LINENUMBER; + } + + public void setSALEORDER_LINENUMBER(String SALEORDER_LINENUMBER) { + this.SALEORDER_LINENUMBER = SALEORDER_LINENUMBER; + } + + public String getMATERIAL_CODE() { + return MATERIAL_CODE; + } + + public void setMATERIAL_CODE(String MATERIAL_CODE) { + this.MATERIAL_CODE = MATERIAL_CODE; + } + + public String getMATERIAL_MODEL() { + return MATERIAL_MODEL; + } + + public void setMATERIAL_MODEL(String MATERIAL_MODEL) { + this.MATERIAL_MODEL = MATERIAL_MODEL; + } + + public Long getORDER_AMOUNT() { + return ORDER_AMOUNT; + } + + public void setORDER_AMOUNT(Long ORDER_AMOUNT) { + this.ORDER_AMOUNT = ORDER_AMOUNT; + } + + public Long getBEFORE_NUMBER() { + return BEFORE_NUMBER; + } + + public void setBEFORE_NUMBER(Long BEFORE_NUMBER) { + this.BEFORE_NUMBER = BEFORE_NUMBER; + } + + public Long getSCAN_NUMBER() { + return SCAN_NUMBER; + } + + public void setSCAN_NUMBER(Long SCAN_NUMBER) { + this.SCAN_NUMBER = SCAN_NUMBER; + } + + public Long getSCRAP_NUMBER() { + return SCRAP_NUMBER; + } + + public void setSCRAP_NUMBER(Long SCRAP_NUMBER) { + this.SCRAP_NUMBER = SCRAP_NUMBER; + } + + public String getSALEORDER_CODE() { + return SALEORDER_CODE; + } + + public void setSALEORDER_CODE(String SALEORDER_CODE) { + this.SALEORDER_CODE = SALEORDER_CODE; + } + + @Override + public String toString() { + return "boxTraceabilityReport{" + + "ORDER_CODE='" + ORDER_CODE + '\'' + + ", SALEORDER_CODE='" + SALEORDER_CODE + '\'' + + ", ORDER_CODE='" + ORDER_CODE + '\'' + + ", SALEORDER_LINENUMBER='" + SALEORDER_LINENUMBER + '\'' + + ", MATERIAL_CODE='" + MATERIAL_CODE + '\'' + + ", MATERIAL_MODEL='" + MATERIAL_MODEL + '\'' + + ", ORDER_AMOUNT=" + ORDER_AMOUNT + + ", BEFORE_NUMBER=" + BEFORE_NUMBER + + ", SCAN_NUMBER=" + SCAN_NUMBER + + ", SCRAP_NUMBER=" + SCRAP_NUMBER + + '}'; + } +} 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 c1f9796..f5d0558 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 @@ -1,6 +1,7 @@ package com.aucma.report.mapper; import com.aucma.report.domain.ProductTraceabilityReport; +import com.aucma.report.domain.boxTraceabilityReport; import java.util.HashMap; import java.util.List; @@ -101,4 +102,11 @@ public interface GeneralReportMapper { * @return */ List> productTraceabilityDetailList(Map hashMap); + + /** + * 发泡箱体追溯报表 + * @param hashMap + * @return + */ + List boxTraceabilityReport(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 016341d..4cf5de6 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 @@ -1,6 +1,8 @@ package com.aucma.report.service; import com.aucma.report.domain.BasePdaRecord; +import com.aucma.report.domain.ProductTraceabilityReport; +import com.aucma.report.domain.boxTraceabilityReport; import java.util.HashMap; import java.util.List; @@ -43,5 +45,10 @@ public interface IProductionReportService */ List> ScanOfflineRecordReportList(Map hashMap); - + /** + * 发泡箱体追溯报表 + * @param hashMap + * @return + */ + List boxTraceabilityReport(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 a7c4222..830c6e5 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 @@ -1,6 +1,7 @@ package com.aucma.report.service.impl; import com.aucma.report.domain.BasePdaRecord; +import com.aucma.report.domain.boxTraceabilityReport; import com.aucma.report.mapper.GeneralReportMapper; import com.aucma.report.service.IProductionReportService; import org.springframework.beans.factory.annotation.Autowired; @@ -59,6 +60,15 @@ public class ProductionReportServiceImpl implements IProductionReportService { return reportMapper.ScanOfflineRecordReportList(hashMap); } + /** + * 发泡箱体追溯报表 + * @param hashMap + * @return + */ + @Override + public List boxTraceabilityReport(Map hashMap) { + return reportMapper.boxTraceabilityReport(hashMap); + } } diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml index 836e91e..2abc2e4 100644 --- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml @@ -281,7 +281,7 @@ ORDER BY RATE - SELECT PL.PRODUCT_LINE_CODE, PL.PRODUCT_LINE_NAME, BO.ORDER_CODE, @@ -334,4 +334,39 @@ ORDER BY PL.EXECUTION_SORT, RQI.INSPECTOR_TIME + +