From c64daab55fe66c3a0ccd572887585dc7430f7724 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Tue, 20 Aug 2024 18:48:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E6=8E=A5=E5=8F=A3=E3=80=81=E8=83=BD=E6=BA=90=E5=8D=95?= =?UTF-8?q?=E8=80=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/domain/ReportOrderEnergyDTO.java | 42 +++++++++++++++- .../service/impl/DataAnalysisServiceImpl.java | 3 ++ .../mapper/report/ReportPointDnbMapper.xml | 48 +++++++++---------- .../op/mes/controller/H5ApiController.java | 1 - .../src/main/java/com/op/mes/domain/H5.java | 12 ++--- .../main/resources/mapper/mes/H5ApiMapper.xml | 4 +- 6 files changed, 76 insertions(+), 34 deletions(-) diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportOrderEnergyDTO.java b/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportOrderEnergyDTO.java index f808bfec..e8912311 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportOrderEnergyDTO.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportOrderEnergyDTO.java @@ -11,7 +11,7 @@ import java.util.Date; public class ReportOrderEnergyDTO extends BaseEntity { private String workorderId; - @Excel(name = "订单号") + @Excel(name = "工单号") private String workorderCode; @Excel(name = "产线编码") private String workorderName; @@ -19,8 +19,14 @@ public class ReportOrderEnergyDTO extends BaseEntity { private String equipmentName; @Excel(name = "产品编码") private String productCode; + @Excel(name = "品类") + private String category; @Excel(name = "产品名称") private String productName; + @Excel(name = "产线组长") + private String lineLeader; + @Excel(name = "规格") + private int umrez; @Excel(name = "生产数量（箱）") private int totalQuantityFeedback; @Excel(name = "电表编号") @@ -66,6 +72,40 @@ public class ReportOrderEnergyDTO extends BaseEntity { } @Excel(name = "能耗（KW·h）") private BigDecimal kw; + @Excel(name = "单箱电耗（电量/产能）") + private BigDecimal singleKw; + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getLineLeader() { + return lineLeader; + } + + public void setLineLeader(String lineLeader) { + this.lineLeader = lineLeader; + } + + public int getUmrez() { + return umrez; + } + + public void setUmrez(int umrez) { + this.umrez = umrez; + } + + public BigDecimal getSingleKw() { + return singleKw; + } + + public void setSingleKw(BigDecimal singleKw) { + this.singleKw = singleKw; + } public BigDecimal getKw() { return kw; diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java index 0321117c..d0a40e1b 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java @@ -1037,6 +1037,9 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService { reportOrderEnergyDTOList.get(i).setEndKW(recordDnbInstantList.get(1).getZxyg()); reportOrderEnergyDTOList.get(i).setMultiplier(recordDnbInstantList.get(0).getCt()); reportOrderEnergyDTOList.get(i).setKw(kw); + BigDecimal totalQuantityFeedbackBD = new BigDecimal(reportOrderEnergyDTOList.get(i).getTotalQuantityFeedback()); + reportOrderEnergyDTOList.get(i).setSingleKw(kw.divide(totalQuantityFeedbackBD, BigDecimal.ROUND_HALF_UP)); + } } } diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml index 04d8d248..937d6ca0 100644 --- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml @@ -55,6 +55,9 @@ + + + @@ -261,29 +264,26 @@ order by m.parentName, m.monitor_name diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/H5ApiController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/H5ApiController.java index d636154c..c63f4294 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/H5ApiController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/H5ApiController.java @@ -32,5 +32,4 @@ public class H5ApiController { List
list = h5ApiService.dailyProductDetil(workTime); return list; } - } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/H5.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/H5.java index ca066f06..3c900f71 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/H5.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/H5.java @@ -6,8 +6,8 @@ public class H5 { private String productName; private String category; private String specifications; - private String StandardStaffing; - private String actualEmployment; + private int StandardStaffing; + private int actualEmployment; private String productionDuration; private int planProduction; private int production; @@ -83,19 +83,19 @@ public class H5 { this.specifications = specifications; } - public String getStandardStaffing() { + public int getStandardStaffing() { return StandardStaffing; } - public void setStandardStaffing(String standardStaffing) { + public void setStandardStaffing(int standardStaffing) { StandardStaffing = standardStaffing; } - public String getActualEmployment() { + public int getActualEmployment() { return actualEmployment; } - public void setActualEmployment(String actualEmployment) { + public void setActualEmployment(int actualEmployment) { this.actualEmployment = actualEmployment; } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/H5ApiMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/H5ApiMapper.xml index b5e0bb6d..82ecd4e8 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/H5ApiMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/H5ApiMapper.xml @@ -40,7 +40,7 @@ FORMAT(ROUND( CASE WHEN MAX(A.use_man) = 0 OR SUM(A.work_time) = 0 THEN NULL - ELSE SUM(mrw.quantity_feedback) / MAX(A.use_man) / SUM(A.work_time) + ELSE (SUM(mrw.quantity_feedback)) / MAX(A.use_man) / (MAX(A.work_time)) END, 1 ), '0.#') AS actualEfficiency, @@ -52,7 +52,7 @@ ROUND( CASE WHEN MAX(A.use_man) = 0 OR SUM(A.work_time) = 0 THEN NULL - ELSE SUM(mrw.quantity_feedback) / MAX(A.use_man) / SUM(A.work_time) + ELSE (SUM(mrw.quantity_feedback)) / MAX(A.use_man) / (MAX(A.work_time)) END, 1 ) AS DECIMAL(10,1))