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
+
+
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 ToolDetail set ActualUseQty=Round(isnull(ActualUseQty,0.0)+#{useQty},0) where Site=#{site} and ToolInstanceID=#{toolInstanceId}
+