From 74307ab935b28fc311341a85bc4c9620bb9542f6 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Fri, 24 Feb 2023 15:52:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=94=9F=E4=BA=A7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=B7=A5=E5=BA=8F=E9=81=93=E5=85=B7=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=202023=E5=B9=B42=E6=9C=8824=E6=97=A5=20=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gaotao/modules/base/service/Impl/BaseServiceImpl.java | 2 +-
 src/main/resources/mapper/base/BaseMapper.xml                 | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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>