From f8c5a02b4290c03a427f7933c698f8219d40c051 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 26 Apr 2024 09:50:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=A7=E6=80=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml | 4 ++--
 .../java/com/op/sap/service/impl/SapRouterServiceImpl.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
index ce152437a..d544f0683 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
@@ -402,8 +402,8 @@
 			qct.check_loc checkLoc,
 		    qct.remark
 		from qc_check_task qct
-				 left join pro_order_workorder pow on pow.workorder_code = qct.order_no
-		where qct.record_id = #{recordId}
+		left join pro_order_workorder pow on pow.workorder_code = qct.order_no
+		where qct.record_id = #{recordId} and pow.del_flag = '0'
 	</select>
     <select id="getCkeckTaskXJList" resultType="com.op.quality.domain.QcCheckTaskIncome">
 		select
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapRouterServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapRouterServiceImpl.java
index 0691a92d8..2df320902 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapRouterServiceImpl.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapRouterServiceImpl.java
@@ -311,7 +311,7 @@ public class SapRouterServiceImpl implements SapRouterService {
             log.error(e.getMessage());
             return R.fail(e.getMessage());
         }
-        return R.ok(successMsg);
+        return R.ok(successMsg.toString());
     }
 }