From d13051c13191267fe6e4b0520131e8ec674e6eaf Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 30 Oct 2023 17:11:39 +0800
Subject: [PATCH] 66

---
 .../jtem/modules/Schedule/dao/ScheduleMapper.java    | 12 +++++++++++-
 .../Schedule/service/impl/ScheduleServiceImpl.java   |  3 +++
 src/main/resources/mapper/board/BoardMapper.xml      |  2 ++
 .../resources/mapper/schedule/ScheduleMapper.xml     |  9 +++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/jtem/modules/Schedule/dao/ScheduleMapper.java b/src/main/java/com/jtem/modules/Schedule/dao/ScheduleMapper.java
index 2a1c6df..4e39351 100644
--- a/src/main/java/com/jtem/modules/Schedule/dao/ScheduleMapper.java
+++ b/src/main/java/com/jtem/modules/Schedule/dao/ScheduleMapper.java
@@ -271,8 +271,18 @@ public interface ScheduleMapper {
      * @throw
      */
     void updateToolSfdc(ToolOutData inData);
-
+    /**
+     * @Description 报工完保存ToolUsageHist
+     * @Title
+      * @param null
+     * @author rq
+     * @date 2023/10/30 15:45
+     * @return null
+     * @throw
+     */
+    void saveToolUsageHist(ToolOutData inData);
     void updateToolActualUseQty(@Param("site")String site,@Param("toolInstanceId")String toolInstanceId,@Param("useQty")Double useQty);
+    String getToolIdWithToolInstanceID(@Param("site")String site,@Param("toolInstanceId")String toolInstanceId);
 
     /**
      * @Description TODO
diff --git a/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java
index d9f90bf..514884c 100644
--- a/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java
@@ -373,6 +373,9 @@ public class ScheduleServiceImpl implements ScheduleService {
         inData.setUseQty(Math.ceil(inData.getFinishQty()/inData.getMoQty()));
         scheduleMapper.updateToolSfdc(inData);
         scheduleMapper.updateToolActualUseQty(inData.getSite(),inData.getToolInstanceId(),inData.getUseQty());
+        String toolId=scheduleMapper.getToolIdWithToolInstanceID(inData.getSite(),inData.getToolInstanceId());
+        inData.setToolId(toolId);
+        scheduleMapper.saveToolUsageHist(inData);
     }
 
     @Override
diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml
index 3832e03..9c7d651 100644
--- a/src/main/resources/mapper/board/BoardMapper.xml
+++ b/src/main/resources/mapper/board/BoardMapper.xml
@@ -35,6 +35,7 @@
         order by a.id desc
     </select>
 
+
     <select id="shopOrderBoard" resultType="com.jtem.modules.board.entity.ShopOrderBoardOutData">
         SELECT Site,OrderNo,NeedDate,PartNo,dbo.Get_PartDesc(site,partNo) partDesc,LotSize,Round(FinishedQty,2) FinishedQty,Round(FinishedQty/LotSize*100.0,1) as percentQty
         ,CustomerID,dbo.Get_CustomerDesc(Site,CustomerID) CustomerDesc,ReceiveDate
@@ -128,5 +129,6 @@
     ORDER BY PL.ProLineNo
 
 </select>
+
 </mapper>
 
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 95492ea..88cb46a 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -327,6 +327,9 @@ Freezeflag,QtyTmp,ManufactureDate,ExpiredDate,QtytoIssue,DemandPartnerType,Deman
     <update id="updateToolActualUseQty">
         update ToolDetail set  ActualUseQty=Round(isnull(ActualUseQty,0.0)+#{useQty},0) where Site=#{site} and ToolInstanceID=#{toolInstanceId}
     </update>
+    <select id="getToolIdWithToolInstanceID" resultType="String">
+        select top 1 ToolId from ToolDetail where site=#{site} and ToolInstanceID=#{toolInstanceId}
+    </select>
 
     <select id="toolUseDetail" resultType="com.jtem.modules.pda.entity.ToolOutData">
           select Site,OrderNo,ItemNo,SeqNo,HistSeqNo,ReportDate,Reportedby,ToolInstanceID,StartDate,FinishDate,FinishFlag,Remark,
@@ -336,5 +339,11 @@ Freezeflag,QtyTmp,ManufactureDate,ExpiredDate,QtytoIssue,DemandPartnerType,Deman
     <update id="updateSOSPrintFlag">
         update SOScheduledRouting set printFlag='Y' where site=#{site} and seqNo=#{seqNo}
     </update>
+    <insert id="saveToolUsageHist">
+        INSERT INTO ToolUsageHist(HistNo, ToolID, Site, ToolInstanceID, SOOrderNo, TransDate,
+        TransQty, CreateDate, CreatedBy, Remark,  AssJobSeqNo)
+        values (REPLACE(CONVERT(varchar, GETDATE(), 112) + REPLACE(CONVERT(varchar, GETDATE(), 108), ':', ''), ' ', ''), #{toolId}, #{site}, #{toolInstanceId}, #{orderNo}, GetDate(),
+        #{finishQty}, GetDate(),  #{reportedby}, '工具报工后自动增加', #{seqNo} )
+    </insert>
 
 </mapper>