diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java
index 21e35346..0cd93254 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java
@@ -356,8 +356,14 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 					.setScale(2, BigDecimal.ROUND_HALF_UP);
 			dto.setCompleteRate(completeRate.toString()+"%");
 			//工时标准=盒量/标准数量
-			BigDecimal workTimeStandar = new BigDecimal(dto.getQuantityAct())
-					                     .divide(new BigDecimal(dto.getIei()),1, BigDecimal.ROUND_UP);
+			BigDecimal workTimeStandar = null;
+			if(StringUtils.isNotBlank(dto.getIei())){
+				workTimeStandar = new BigDecimal(dto.getQuantityAct())
+						.divide(new BigDecimal(dto.getIei()),1, BigDecimal.ROUND_UP);
+			}else{
+				workTimeStandar = new BigDecimal("0");
+			}
+
 			dto.setWorkTimeStandar(workTimeStandar.toString());
 			//工时产线效率=工时标准/工时实际
 			BigDecimal productivity = new BigDecimal(dto.getWorkTimeStandar())
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 b1b8a35b..0eb56621 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
@@ -301,6 +301,7 @@
         where pow.del_flag='0'
           and pow.workorder_name = #{equCode}
           and CONVERT(DATE, pow.product_date) BETWEEN DATEADD(DAY, -15, CONVERT(DATE, GETDATE())) AND CONVERT(DATE, GETDATE())
+          and pow.parent_order='0'
         group by pow.product_date
     </select>
     <select id="getProduction15DaysAct" resultType="com.op.mes.domain.MesReportWork">
@@ -311,6 +312,7 @@
         where mrw.del_flag='0' and pow.del_flag='0' and mrw.parent_order = '0'
           and pow.workorder_name = #{equCode}
           and CONVERT(DATE, pow.product_date) BETWEEN DATEADD(DAY, -15, CONVERT(DATE, GETDATE())) AND CONVERT(DATE, GETDATE())
+          and pow.parent_order='0'
         group by pow.product_date
     </select>
     <select id="getWorkOrder" resultType="com.op.system.api.domain.dto.BoardDTO">
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 0abe5b7b..57c4c1a1 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
@@ -529,7 +529,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		<if test="feedbackTimeStart != null "> and pow.product_date >= #{feedbackTimeStart}</if>
 		<if test="feedbackTimeEnd != null "> and #{feedbackTimeEnd} >= pow.product_date</if>
-		<if test="orderCode != null  and orderCode != ''"> and pow.order_code like concat('%', #{orderCode}, '%')</if>
+		<if test="orderCode != null  and orderCode != ''"> and pow.workorder_code_sap like concat('%', #{orderCode}, '%')</if>
+		<if test="workorderCode != null  and workorderCode != ''"> and pow.workorder_code like concat('%', #{workorderCode}, '%')</if>
 		</where>
 		order by pow.product_date desc
 	</select>