From c5f16b8e6852630e8f15748a4727a053642697f7 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 30 Aug 2023 20:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97(=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA=E7=BA=BF=E4=BD=93)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/plan/service/impl/ProOrderServiceImpl.java     | 3 ++-
 .../op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
index e749a123..1ff023f5 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
@@ -510,7 +510,8 @@ public class ProOrderServiceImpl implements IProOrderService {
     @Override
     @DS("#header.poolName")
     public List<ProLine> getProEquipment(String routeCode) {
-        return proOrderMapper.selectEquipment(proOrderMapper.selectEquipmentListByRouteCode(routeCode).split(","));
+        String[] split = proOrderMapper.selectEquipmentListByRouteCode(routeCode).split(",");
+        return proOrderMapper.selectEquipment(split);
     }
 
     public void getSAPOrderByFactory(String poolName) {
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml
index 59815104..a87594c9 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml
@@ -138,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectEquipmentListByRouteCode" resultType="java.lang.String">
 		select pps.equipment
 		from pro_route_process pp
-				 INNER JOIN pro_process pps on pp.next_process_id = pps.process_id
+				 INNER JOIN pro_process pps on pp.process_code = pps.process_code
 				 INNER JOIN pro_route pr on pr.route_id = pp.route_id
 		where pr.route_code = #{routeCode} and pp.order_num = '1'
 	</select>