From de42cb818178291e030f52ee30b9c15cb80ed5fb Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Tue, 18 Mar 2025 17:35:26 +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=8A=A5=E8=A1=A8=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=97=A5=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/mes/domain/vo/MesDailyReportVo.java | 10 ++++++++++ .../java/com/op/mes/service/impl/H5ApiServiceImpl.java | 2 +- .../main/resources/mapper/mes/MesReportWorkMapper.xml | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java index dbde8a7ab..2ec4209fa 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java @@ -29,6 +29,8 @@ public class MesDailyReportVo extends BaseEntity { private String equipmentCode; @Excel(name = "组别") private String equipmentName; + @Excel(name = "班次") + private String shiftDesc; @Excel(name = "品类") private String prodType;//分类 @@ -104,6 +106,14 @@ public class MesDailyReportVo extends BaseEntity { private String machineCode; private BigDecimal reportRate; + public String getShiftDesc() { + return shiftDesc; + } + + public void setShiftDesc(String shiftDesc) { + this.shiftDesc = shiftDesc; + } + public String getTeamLeaderNames() { return teamLeaderNames; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/H5ApiServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/H5ApiServiceImpl.java index 9360bbe17..57beb555e 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/H5ApiServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/H5ApiServiceImpl.java @@ -30,7 +30,7 @@ public class H5ApiServiceImpl implements H5ApiService { public List
dailyProductDetil(String workTime) { //查询当天的生产情况 H5 h5=new H5(); - h5.setFeedbackTime("2025-03-05"); + h5.setFeedbackTime(workTime); //报工信息 List
h5List=h5ApiMapper.selectMesLineProdceList(h5); //报工信息处理 diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 201851c02..6278aad18 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -768,6 +768,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" be.sap_name sapName, be.equipment_code equipmentCode, be.equipment_name equipmentName, + bst.Shift_Desc shiftDesc, pow.workorder_code_sap workorderCodeSap, RIGHT(pow.workorder_code_sap, 9) AS workorderCodeSaps, pow.product_code productCode, @@ -786,6 +787,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bp.report_rate reportRate from base_equipment be left join pro_order_workorder pow on be.equipment_code = pow.workorder_name + LEFT JOIN base_shifts_t bst ON bst.Shift_Id=pow.shift_id left join mes_line_product mlp on pow.workorder_name = mlp.line_code and pow.product_code = mlp.product_code and mlp.del_flag='0' left join base_product bp on bp.product_code = pow.product_code where be.del_flag = '0' and be.sap_code is not null and pow.status in ('w2','w3')