From 34aefe04695f882ee06dd79b12c1e9d83ad5d82b Mon Sep 17 00:00:00 2001
From: DouDou <877258667@qq.com>
Date: Fri, 13 Sep 2024 09:39:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E5=B7=A5=E5=85=B7=E7=9A=84=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=AF=BF=E5=91=BD=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/toolman/dao/ToolDetailMapper.java |  8 ++++++
 .../service/impl/ToolHeaderServiceImpl.java   |  4 ++-
 .../mapper/toolman/ToolDetailMapper.xml       | 26 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/toolman/dao/ToolDetailMapper.java b/src/main/java/com/gaotao/modules/toolman/dao/ToolDetailMapper.java
index 5eea8f1..d4a8ed4 100644
--- a/src/main/java/com/gaotao/modules/toolman/dao/ToolDetailMapper.java
+++ b/src/main/java/com/gaotao/modules/toolman/dao/ToolDetailMapper.java
@@ -193,4 +193,12 @@ public interface ToolDetailMapper {
      * @date: 2022/12/20 14:09
      */
     int getLocationCount(LocationQuery locationQuery);
+
+    /**
+    * @description: 修改工具实例的方法 以前的方法不能修改工具的寿命
+    * @author LR
+    * @date 2024/9/13 9:30
+    * @version 1.0
+    */
+    void updateToolDetailData(ToolDetailQuery toolDetailQuery);
 }
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java b/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java
index a6cadd0..b9683ce 100644
--- a/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java
@@ -833,6 +833,8 @@ public class ToolHeaderServiceImpl implements ToolHeaderService {
                 throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200612));
             }
         }
-        toolDetailMapper.updateToolDetailInfo(toolDetailQuery);
+        //toolDetailMapper.updateToolDetailInfo(toolDetailQuery);
+        //修改工具的信息
+        toolDetailMapper.updateToolDetailData(toolDetailQuery);
     }
 }
diff --git a/src/main/resources/mapper/toolman/ToolDetailMapper.xml b/src/main/resources/mapper/toolman/ToolDetailMapper.xml
index 8b07066..5463cb8 100644
--- a/src/main/resources/mapper/toolman/ToolDetailMapper.xml
+++ b/src/main/resources/mapper/toolman/ToolDetailMapper.xml
@@ -242,12 +242,38 @@
         </where>
     </update>
     <update id="updateToolDetailInfo">
+        update ToolDetail
+        <set>
+            <if test="statusRef != null">
+                statusRef = #{statusRef,jdbcType=VARCHAR},
+            </if>
+            LocationID = #{locationId,jdbcType=VARCHAR},
+            Status = #{status,jdbcType=VARCHAR},
+            Remark = #{remark,jdbcType=VARCHAR},
+            SupplierID = #{supplierId,jdbcType=VARCHAR},
+            PurchaseDate = #{purchaseDate,jdbcType=TIMESTAMP},
+            PhaseInDate = #{phaseInDate,jdbcType=TIMESTAMP},
+            PhaseOutDate = #{phaseOutDate,jdbcType=TIMESTAMP},
+            lifespan = #{lifespan}
+        </set>
+        <where>
+            Site=#{site,jdbcType=VARCHAR} AND ToolInstanceID=#{toolInstanceId,jdbcType=VARCHAR}
+            <if test="toolId!= '' and toolId != null">
+                AND ToolID=#{toolId,jdbcType=VARCHAR}
+            </if>
+
+        </where>
+    </update>
+
+    <!-- LR 新增的修改方法  添加了使用寿命的方法 -->
+    <update id="updateToolDetailData">
         update ToolDetail
         <set>
             <if test="statusRef != null">
                 statusRef = #{statusRef,jdbcType=VARCHAR},
             </if>
                 LocationID = #{locationId,jdbcType=VARCHAR},
+                EstUseQty = #{estUseQty},
                 Status = #{status,jdbcType=VARCHAR},
                 Remark = #{remark,jdbcType=VARCHAR},
                 SupplierID = #{supplierId,jdbcType=VARCHAR},