diff --git a/src/main/java/com/alteams/modules/shoporder/service/impl/OrderTimeHistServiceImpl.java b/src/main/java/com/alteams/modules/shoporder/service/impl/OrderTimeHistServiceImpl.java
index 2190a3c..fad7068 100644
--- a/src/main/java/com/alteams/modules/shoporder/service/impl/OrderTimeHistServiceImpl.java
+++ b/src/main/java/com/alteams/modules/shoporder/service/impl/OrderTimeHistServiceImpl.java
@@ -308,12 +308,14 @@ public class OrderTimeHistServiceImpl extends ServiceImpl<OrderTimeHistDao, Orde
             // 校验工单数量是否结束
             if (totalOrderTimeHist.getQtyprd() == ifsShopOrderVo.getRevisedQtyDue()) {
                 // 获取该工序 最后一次生产时间
+                orderTimeHistQuery.setEventtype("F");
                 OrderTimeHistEntity lastOrderTimeHistInfo = getLastOrderTimeHistInfo(orderTimeHistQuery);
                 shopOrderHistEntity.setFinishDate(lastOrderTimeHistInfo.getTilltime());
                 shopOrderHistEntity.setFinishBy(lastOrderTimeHistInfo.getTillenteredby());
             }
         }
         // 获取该工序第一次生产时间
+        orderTimeHistQuery.setEventtype("F");
         OrderTimeHistEntity firstOrderTimeHistInfo = getFirstOrderTimeHistInfo(orderTimeHistQuery);
         shopOrderHistEntity.setStartDate(firstOrderTimeHistInfo.getEventtime());
         shopOrderHistEntity.setStartBy(firstOrderTimeHistInfo.getEnteredby());
@@ -540,4 +542,4 @@ public class OrderTimeHistServiceImpl extends ServiceImpl<OrderTimeHistDao, Orde
         return workCenterDayTime;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/mapper/shoporder/OrderTimeHistDao.xml b/src/main/resources/mapper/shoporder/OrderTimeHistDao.xml
index e676308..ebe4038 100644
--- a/src/main/resources/mapper/shoporder/OrderTimeHistDao.xml
+++ b/src/main/resources/mapper/shoporder/OrderTimeHistDao.xml
@@ -357,6 +357,7 @@
         from SFDC_TimeHist
         where site = #{site}
           and OrderNo = #{orderno}
+          and ItemNo = #{itemno}
           and OrderRef2 = #{orderref2}
           and OrderRef1 = #{orderref1}
           and EventType = #{eventtype}
@@ -399,4 +400,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>