From ee9d487a7b64f2f2dfe462cdb6e0912fc8e11585 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Tue, 21 Apr 2026 15:40:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/order/service/IYieldOrderCraftService.java      | 2 +-
 .../order/service/impl/YieldOrderCraftServiceImpl.java   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java
index 994e8a26..1fbf812d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java
@@ -49,5 +49,5 @@ public interface IYieldOrderCraftService extends BaseService<YieldOrderCraft> {
 	 * @param rxlSpace            需要特殊分派，true:需要， false：不需要，null：不需要
 	 * @throws BusinessException
 	 */
-	void automaticDispatch(List<YieldOrderCraft> yieldOrderCraftList, YieldOrder yieldOrder, Boolean factor, Boolean rxlSpace) throws BusinessException;
+	void automaticDispatch(List<YieldOrderCraft> yieldOrderCraftList, YieldOrder yieldOrder, Boolean factor, Boolean rxlSpace) throws Exception;
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java
index 90ffb1aa..49caacd8 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java
@@ -93,9 +93,10 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl<YieldOrderCraftM
 	}
 
 	@Override
-	public void automaticDispatch(List<YieldOrderCraft> yieldOrderCraftList, YieldOrder yieldOrder, Boolean factor, Boolean rxlSpace) throws BusinessException {
+	public void automaticDispatch(List<YieldOrderCraft> yieldOrderCraftList, YieldOrder yieldOrder, Boolean factor, Boolean rxlSpace) throws Exception {
 		// 组装key为工艺能力的作业计划map
-		Map<Long, List<YieldOrderCraft>> craftAbilityMap = yieldOrderCraftList.stream().collect(Collectors.groupingBy(YieldOrderCraft::getCaId));
+		Map<Long, List<YieldOrderCraft>> craftAbilityMap = yieldOrderCraftList.stream()
+				.collect(Collectors.groupingBy(YieldOrderCraft::getCaId,LinkedHashMap::new,Collectors.toList()));
 		//作业计划map工艺能力key集合
 		Set<Long> craftKeys = craftAbilityMap.keySet();
 		//获取到认定的主工艺能力(默认第一个工艺能力为主工艺能力)
@@ -382,7 +383,7 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl<YieldOrderCraftM
 	 */
 	private List<YieldOrderCraft> bindWorkCenter(Long workCenterId, Map<Long, WorkCenter> workCenterMap, Long craftAbilityId,
 												 Map<Long, List<YieldOrderCraft>> craftAbilityMap, Set<Long> craftKeys,
-												 YieldOrder yieldOrder, Boolean factor) throws BusinessException {
+												 YieldOrder yieldOrder, Boolean factor) throws Exception {
 		List<YieldOrderCraft> orderCrafts = new ArrayList<>();
 		// 开始循环生产订单中组合的工艺能力key集合， 主工艺能力之前的全部分配到此作业中心
 		for (Long craftId : craftKeys) {
@@ -568,7 +569,7 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl<YieldOrderCraftM
 	 * @CreateTime 2023/2/17 16:28
 	 */
 	private List<YieldOrderCraft> bindOem(Oem oemCustomer, Long craftAbilityId, Map<Long,
-		List<YieldOrderCraft>> craftAbilityMap, Set<Long> keys, YieldOrder yieldOrder, Boolean factor) {
+		List<YieldOrderCraft>> craftAbilityMap, Set<Long> keys, YieldOrder yieldOrder, Boolean factor) throws Exception {
 
 		List<YieldOrderCraft> rtnList = new ArrayList<>();