From 76bf6243c5957187e5a4b6c7f4e283683badaa2e Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Fri, 20 Aug 2021 17:25:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=95=B4=E7=90=86=E4=B8=8B?=
 =?UTF-8?q?=E8=BE=BE=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ShopOrderReleaseServiceImpl.java         | 2 +-
 .../com/foreverwin/mesnac/meapi/mapper/RouterMapper.java  | 2 ++
 .../foreverwin/mesnac/meapi/service/RouterService.java    | 2 ++
 .../mesnac/meapi/service/impl/RouterServiceImpl.java      | 5 +++++
 meapi/src/main/resources/mapper/RouterMapper.xml          | 8 +++++++-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
index b51b33fd..f0829af6 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
@@ -115,7 +115,7 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
             BigDecimal qtyToRelease = qtyToBuild.subtract(qtyReleased);
 
             //查询工艺路线
-            Router routerModel = routerService.getById(routerBo);
+            Router routerModel = routerService.getCurrentRouter(routerBo);
             if (routerModel == null) {
                 throw new BaseException("工艺路线[" +StringUtils.trimHandle(routerBo)+ "]不存在");
             }
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterMapper.java
index ac430440..9c8a8ca1 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterMapper.java
@@ -20,5 +20,7 @@ public interface RouterMapper extends BaseMapper<Router> {
 
     Router selectRouterBySfcBo(@Param("sfcBo") String sfcBo);
 
+    Router selectCurrentRouter(@Param("routerBo") String routerBo);
+
     List<Router> selectRouterList4RevisionDesc(@Param("site") String site, @Param("router") String router);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterService.java
index 23c5c39b..3cab1e65 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterService.java
@@ -28,6 +28,8 @@ public interface RouterService extends IService<Router> {
 
     Router getRouterBySfcBo(String sfcBo);
 
+    Router getCurrentRouter(String routerBo);
+
     /**
      * 查询最大版本的工艺路线
      *
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterServiceImpl.java
index b16d00d3..4137a554 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterServiceImpl.java
@@ -47,6 +47,11 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
         return routerMapper.selectRouterBySfcBo(sfcBo);
     }
 
+    @Override
+    public Router getCurrentRouter(String routerBo) {
+        return routerMapper.selectCurrentRouter(routerBo);
+    }
+
     @Override
     public Router getMaxRevisionRouter(String site, String router) {
         List<Router> list = routerMapper.selectRouterList4RevisionDesc(site, router);
diff --git a/meapi/src/main/resources/mapper/RouterMapper.xml b/meapi/src/main/resources/mapper/RouterMapper.xml
index 52d4ecb2..d317c1e2 100644
--- a/meapi/src/main/resources/mapper/RouterMapper.xml
+++ b/meapi/src/main/resources/mapper/RouterMapper.xml
@@ -636,7 +636,6 @@
     </delete>
 
     <!-- BaseMapper标准查询/修改/删除 -->
-
     <select id="selectRouterBySfcBo" resultType="com.foreverwin.mesnac.meapi.model.Router">
         SELECT R.HANDLE, R.SITE, R.ROUTER, R.ROUTER_TYPE, R.DESCRIPTION, R.TEMPORARY_ROUTER, R.STATUS_BO, R.ENTRY_ROUTER_STEP_BO, R.COPIED_FROM_ROUTER_BO, R.REVISION, R.CURRENT_REVISION, R.HAS_BEEN_RELEASED
         FROM SFC SC
@@ -646,6 +645,13 @@
         WHERE SFC_BO = #{sfcBo}
     </select>
 
+    <select id="selectCurrentRouter" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM ROUTER
+        WHERE (HANDLE = #{routerBo} OR #{routerBo} = 'RouterBO:'||SITE||','||ROUTER||',H,#')
+         AND CURRENT_REVISION = 'true'
+    </select>
+
     <select id="selectRouterList4RevisionDesc" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List"></include>
         FROM ROUTER