From 19ec79005cf972418021d54acde0d6f9ed73cfbb Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Thu, 14 Nov 2024 18:24:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=9C=8B=E6=9D=BF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/domain/vo/MesDailyReportVo.java | 35 +++++++++++++++++-- .../service/impl/IWCInterfaceServiceImpl.java | 2 +- .../main/resources/mapper/mes/H5ApiMapper.xml | 2 +- .../main/resources/mapper/mes/MesMapper.xml | 2 +- .../mapper/mes/MesReportWorkMapper.xml | 9 +++-- .../mapper/mes/MesUnitpriceReportMapper.xml | 1 + 6 files changed, 43 insertions(+), 8 deletions(-) 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 cecbce7b..fd99c991 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 @@ -31,16 +31,20 @@ public class MesDailyReportVo extends BaseEntity { private String equipmentName; @Excel(name = "品类") private String prodType;//分类 - @Excel(name = "组长") + private String teamLeaderName;//组长 - @Excel(name = "工单号") + @Excel(name = "组长") + private String teamLeaderNames;//组长 private String workorderCode; // 工时 private BigDecimal unitWorkingHours; private String workorderCodeSap; - @Excel(name = "产品编码") + @Excel(name = "工单号") + private String workorderCodeSaps; private String productCode;//产品编码 + @Excel(name = "产品编码") + private String productCodes; @Excel(name = "产品名称") private String productName;//产品名称 @Excel(name = "规格") @@ -95,10 +99,35 @@ public class MesDailyReportVo extends BaseEntity { private String workCenter; private String equipmentTypeCode; + @Excel(name = "影响效率原因") private String reason; private String machineCode; private BigDecimal reportRate; + public String getTeamLeaderNames() { + return teamLeaderNames; + } + + public void setTeamLeaderNames(String teamLeaderNames) { + this.teamLeaderNames = teamLeaderNames; + } + + public String getWorkorderCodeSaps() { + return workorderCodeSaps; + } + + public void setWorkorderCodeSaps(String workorderCodeSaps) { + this.workorderCodeSaps = workorderCodeSaps; + } + + public String getProductCodes() { + return productCodes; + } + + public void setProductCodes(String productCodes) { + this.productCodes = productCodes; + } + public String getReason() { return reason; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 7121c18b..4ed0d547 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -200,7 +200,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { totals = mesMapper.getTotalNum(boardDTO); for(BoardDTO total:totals){ - total.setTotalNum(total.getTotalNum()); + total.setTotalNum(total.getTotalNum()-5); total.setEquTypeCode(total.getEquTypeCode().replace("H","X")); total.setEquTypeName(total.getEquTypeName().replace("烘房","收坯机")); } 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 38f6e205..f944f5e2 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 @@ -99,7 +99,7 @@ GROUP BY monitor_id, CAST(end_time AS DATE) ORDER BY - report_date ASC; + monitor_name ASC, report_date ASC; diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 1b23c6a4..1e047c97 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -119,7 +119,7 @@ from mes_material_transfer_result mt left join base_equipment equ on mt.equipmentCode = equ.equipment_code where CONVERT(varchar(10),mt.update_time, 120) = #{ymd} and equ.equipment_name is not null - and equ.equipment_type_code = #{equTypeCode} and mt.equipmentCode not in('H61','H62','H63') + and equ.equipment_type_code = #{equTypeCode} and mt.shift_id = #{shiftId} 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 e6891b73..0a84cd7e 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 @@ -675,11 +675,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" be.equipment_code equipmentCode, be.equipment_name equipmentName, pow.workorder_code_sap workorderCodeSap, + RIGHT(pow.workorder_code_sap, 9) AS workorderCodeSaps, pow.product_code productCode, + RIGHT(pow.product_code, 11) AS productCodes, pow.product_name productName, pow.unit unit, pow.quantity_split quantitySplit, pow.attr3 teamLeaderName, + LEFT(pow.attr3, CHARINDEX('-', pow.attr3) - 1) AS teamLeaderNames, mlp.use_man manStandard, mlp.hour_efficiency efficiency, mlp.attr1 unitWorkingHours, @@ -780,8 +783,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT mrw.machine_name, mrw.workorder_code, - pow.workorder_code_sap, - mrw.product_code, + RIGHT(pow.workorder_code_sap, 9) AS workorder_code_sap, +-- pow.workorder_code_sap, + RIGHT(mrw.product_code, 11) AS product_code, +-- mrw.product_code, mrw.product_name, mrw.batch, mrw.spec, diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml index e463ab55..a658cfe0 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml @@ -101,6 +101,7 @@ mes_unitprice_report mur LEFT JOIN mes_unit_price mup ON RIGHT ( mur.product_code, 11 ) = mup.product_code AND mur.childprocess_code = mup.childprocess_code + AND mup.line_code = mur.line_code LEFT JOIN base_equipment be ON be.sap_code= mur.line_code LEFT JOIN ( SELECT parent_order, SUM ( quantity ) AS total_quantity,SUM(quantity_feedback) AS order_quantity FROM mes_report_work GROUP BY parent_order ) mrw ON mur.workorder_code = mrw.parent_order LEFT JOIN ( SELECT workorder_code, SUM ( quantity ) AS total_quantity,SUM(quantity_feedback) AS order_quantity FROM mes_report_work GROUP BY workorder_code ) mrws ON mur.workorder_code = mrws.workorder_code