From 0baefcafb0cc179cc2d6396f4bc40a23f7b4f8a7 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Mon, 27 Apr 2026 21:17:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E5=8F=B7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/YieldOrderServiceImpl.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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 8c981b7a..d5a49d29 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
@@ -1255,7 +1255,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 				}
 			}
 			YieldOrder subYield = BeanUtil.copy(yieldOrder, YieldOrder.class);
-			subYield.setYpArea(null);
+			subYield.setId(null);
 			subYield.setFatherYoId(yieldOrder.getId());
 			subYield.setYoCode(nextYieldOrderCode(yieldOrder.getYoCode()));
 			subYield.setPartCode(dsPart.getPartCode());
@@ -1353,10 +1353,12 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 		LambdaQueryWrapper<YieldOrder> wrapper = Wrappers.lambdaQuery(YieldOrder.class)
 			.likeRight(YieldOrder::getBatchNo, codePattern)
 			.orderBy(true, false, YieldOrder::getYoCode);
-		YieldOrder yieldOrder = baseMapper.selectOne(wrapper);
-
-		if (yieldOrder != null) {
-			num = Integer.parseInt(yieldOrder.getBatchNo().substring(codePattern.length(), codePattern.length() + len));
+		List<YieldOrder> yieldOrderList = baseMapper.selectList(wrapper);
+		if(!CollectionUtils.isEmpty(yieldOrderList)){
+			YieldOrder yieldOrder = yieldOrderList.get(0);
+			if (yieldOrder != null) {
+				num = Integer.parseInt(yieldOrder.getBatchNo().substring(codePattern.length(), codePattern.length() + len));
+			}
 		}
 		num++;
 		return num;