From 3cd86d89b8351ecd3805ad9fa52bf2ebb9ec237a Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Tue, 21 Apr 2026 15:45:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/dashboard/constant/TaskingConstant.java            | 2 +-
 .../desk/dashboard/service/impl/DsPartServiceImpl.java      | 2 +-
 .../desk/order/service/impl/YieldOrderServiceImpl.java      | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java
index c7cdf86e..42002659 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java
@@ -86,7 +86,7 @@ public  interface TaskingConstant {
      */
     String TRIAL_ORDER_TIMEOUT = "4";
     /**
-     * 检验超时
+     * 无工艺
      */
     String INSPECTION_TIMEOUT = "5";
     /**
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
index 7f3de468..185396e1 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
@@ -938,7 +938,7 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 		dsTaskingEntity.setPartCode(partEntity.getPartCode());
 		dsTaskingEntity.setPartName(partEntity.getPartName());
 		dsTaskingEntity.setTaskStatus(TaskingConstant.TASK_STATUS_WAIT);
-		dsTaskingEntity.setTaskType(TaskingConstant.MAINTAIN_TASK);
+		dsTaskingEntity.setTaskType(TaskingConstant.INSPECTION_TIMEOUT);
 		if (partVersionEntity != null) {
 			dsTaskingEntity.setVersion(partVersionEntity.getPartVersion());
 		}
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 76f67441..60a6627e 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
@@ -384,7 +384,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 //		}
 
 		Integer rank;
-		// 先判断是否是烧结订单
+		// 先判断是否是热表订单 不是返回二级工艺
 		if (YieldOrderEnum.YIELD_TYPE_1.getCode() != yieldOrder.getYieldType()) {
 			rank = DsCraftEnum.RANK_TWO.getCode();
 		} else {
@@ -1322,11 +1322,13 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			part = dsPartService.selectDsPartByPatCodeAndVersion(yieldOrder.getPartCode(), yieldOrder.getPartVersion());
 		}
 		// 工作订单备注中包含大小写的HTBY时，执行二级工艺
-		if (yieldOrder.getYpMemo() != null && yieldOrder.getYpMemo().toLowerCase(Locale.ROOT).contains("htby")) {
+		// 取memo字段(但是从erp取数据时没有对memo赋值,所以判断不会执行)
+		if (yieldOrder.getMemo() != null && yieldOrder.getMemo().toLowerCase(Locale.ROOT).contains("htby")) {
 			return DsCraftEnum.RANK_TWO.getCode();
 		}
 
 		// 判定是否为镀金零件
+		// 取局部镀零件表中数据
 		if (CommonConstant.BOOLEAN_TRUE.equals(part.getGoldMark())) {
 			// 获取零件工艺级别面积判定值
 //			Integer levConfirmVal = 20;