diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
index 5468a59..9b8bb9d 100644
--- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
@@ -1499,7 +1499,7 @@ public class BaseServiceImpl implements BaseService {
         baseMapper.saveNewItemNo(tableName, inData.getSite(), inData.getPartNo(), inData.getRevNo());
         baseMapper.saveNewTool(tableName, inData.getSite(), inData.getPartNo(), inData.getRevNo(), inData.getUser());
         baseMapper.deleteRoutingChangeCach(tableName);
-        //todo 修改工单可用机台 , 删除可用机台 ,插入加工中心可用机台
+        // 修改工单可用机台 , 删除可用机台 ,插入加工中心可用机台
         // 删除订单对应的可用机台
         List<ShopOrderData> shopOrderData = shopOrderService.getShopOrderByPart(inData);
         if (CollectionUtils.isNotEmpty(shopOrderData)) {
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index b347ad6..39fec9b 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -1006,9 +1006,13 @@
         ,T.Remark,T.CreateDate,T.CreatedBy
         from RoutingTool as T,ToolHeader as P
         <where>
+
             <if test="toolID != null and toolID != ''">
                 and T.ToolID = #{toolID}
             </if>
+            <if test="newToolId != null and newToolId != ''">
+                and T.ToolID = #{newToolId}
+            </if>
             <if test="itemNo != null and itemNo != ''">
                 and T.ItemNo = #{itemNo}
             </if>