From 529fac55754b9e4a35e72ad3643bd8bb8a6630bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Tue, 16 Jun 2026 15:58:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java | 2 +-
 .../desk/order/service/impl/YieldOrderCraftServiceImpl.java     | 2 +-
 .../desk/order/service/impl/YieldOrderDailyAssignImpl.java      | 2 +-
 .../desk/produce/service/impl/WorkOrderServiceImpl.java         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java
index ed819a665..848deaa27 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java
@@ -118,5 +118,5 @@ public class PlanAssignSteer extends BaseEntity {
 	 * 日分派量
 	 */
 	@Schema(description = "日分派量")
-	private String assign;
+	private Double assign;
 }
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 07c99278f..c900ec452 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
@@ -259,7 +259,7 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl<YieldOrderCraftM
                             log.info("自动分派,流程卡号:{},分派总量:{},厂内分派比列:{}", yieldOrder.getCardNo(), totalNum, rate);
 
                             // 如果厂内占比大于已经设置的比列，则直接分派外协
-                            if (rate <= Double.parseDouble(craftAbility.getInRate())) {
+                            if (craftAbility.getInRate() != null && rate <= Double.parseDouble(craftAbility.getInRate())) {
                                 log.info("{}自动分派按照比例分派给厂内：{}，分派比例：{}  应分比例：{}", yieldOrder.getCardNo(), workCenter.getWcName(), rate, craftAbility.getInRate());
                                 dispatchCraftList = this.bindWorkCenter(workCenter.getId(), workCenterMap, hostAbilityId, craftAbilityMap, craftKeys, yieldOrder, null);
                             }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderDailyAssignImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderDailyAssignImpl.java
index 73ca9ec7d..243723bbe 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderDailyAssignImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderDailyAssignImpl.java
@@ -164,7 +164,7 @@ public class YieldOrderDailyAssignImpl extends BaseServiceImpl<YieldOrderDailyAs
 		for (PlanAssignSteer bpas : bpasLst) {
 			//如果是第一次，周产量直接赋值
 			if ((bpas.getWeekAssign() == null || bpas.getWeekAssign().compareTo(BigDecimal.ZERO) == 0) && bpas.getOemId().equals(ocId)) {
-				bpas.setAssign(String.valueOf(area));
+				bpas.setAssign(area);
 				bpas.setWeekAssign(BigDecimal.valueOf(area));
 				if (totalArea == 0D) {
 					totalArea = area;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
index 8676168fc..290a62eb8 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
@@ -1298,7 +1298,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         orderDataVO.setYpQty(yieldOrder.getYpQty());
         orderDataVO.setYieldType(yieldOrder.getYieldType());
         orderDataVO.setCurStatus(WorkOrderEnum.getName(workOrder.getRunStatus()));
-        orderDataVO.setPriority(WorkOrder.priorityMap.get(workOrder.getPriority()));
+        orderDataVO.setPriority(YieldOrderEnum.getName(workOrder.getPriority()));
         User user = UserCache.getUser(workOrder.getDispatcher());
         orderDataVO.setDispatcher(user != null ? user.getRealName() : "");
         orderDataVO.setProdIdent(yieldOrder.getProductIdent());