From f16f6bf2806c4b3fef44c43d9cf6ddac33fd2c85 Mon Sep 17 00:00:00 2001
From: yfy <1976974459@qq.com>
Date: Wed, 12 Apr 2023 14:36:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B1=87=E6=80=BB=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E6=97=A5=E6=9C=9F=E4=B8=8D=E7=AC=A6=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shoporder/service/impl/OrderTimeHistServiceImpl.java      | 4 +++-
 src/main/resources/mapper/shoporder/OrderTimeHistDao.xml      | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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>