From c34c336d7062648fd0c82b7eb5d3b2307032695a Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Thu, 25 Jun 2026 15:13:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=A7=E7=BB=93=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/order/service/impl/YieldOrderServiceImpl.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
index df13230e9..234ebcd32 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@@ -267,7 +267,15 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
             yieldStatusList.add(YieldOrderEnum.getEnum(entity.getStatus()));
         }
 
-        entity.setIsSinTerIng(true);
+        boolean hasCondition = StringUtils.isNotEmpty(entity.getCardNo())
+                || StringUtils.isNotEmpty(entity.getYpCode())
+                || StringUtils.isNotEmpty(entity.getYoCode())
+                || StringUtils.isNotEmpty(entity.getPartCode())
+                || StringUtils.isNotEmpty(entity.getBatchNo())
+                || StringUtils.isNotEmpty(entity.getRoamNo())
+                || ObjectUtil.isNotEmpty(entity.getYieldType())
+                || StringUtils.isNotEmpty(entity.getReworkCode());
+        entity.setIsSinTerIng(!hasCondition);
 
         List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList, yieldStatusList);