From 8bd1b457477727e735a96393cbc52883995dec34 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Wed, 20 Nov 2024 16:35:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=97=A5=E6=8A=A5=E8=A1=A8?=
=?UTF-8?q?=E5=AF=BC=E5=87=BA=EF=BC=8C=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java | 2 +-
.../src/main/resources/mapper/mes/MesReportWorkMapper.xml | 2 +-
2 files changed, 2 insertions(+), 2 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 fd99c991..2df11124 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
@@ -74,7 +74,7 @@ public class MesDailyReportVo extends BaseEntity {
private String workorderName;
private String quantity;//计划产量（箱）
- @Excel(name = "实际用人")
+ @Excel(name = "标准用人")
private String manStandard;//实际用人
@Excel(name = "标准工时")
private String workTimeStandard;//工时-标准
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 0a84cd7e..509441ea 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
@@ -696,7 +696,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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')
and pow.parent_order = '0' and pow.del_flag='0'
- and be.sap_name like concat('%', #{sapName}, '%')
+ and be.equipment_name like concat('%', #{sapName}, '%')
and be.workshop_code = #{workCenter}
and be.equipment_type_code = #{equipmentTypeCode}