From 8ae1004afdd9814bf21c8d1564d69f369b34f1c9 Mon Sep 17 00:00:00 2001
From: liuqingkun <liu840185317@users.noreply.github.com>
Date: Sat, 28 Mar 2026 18:27:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=B7=A5=E8=89=BA=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=B7=A5=E8=89=BA=E7=AD=89=E7=BA=A7?=
 =?UTF-8?q?=E5=88=B0=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95rank=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/YieldOrderServiceImpl.java      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 6a6236a4..533d91e5 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
@@ -18,10 +18,7 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.core.tool.utils.StringPool;
+import org.springblade.core.tool.utils.*;
 import org.springblade.desk.dashboard.constant.DsCraftConstant;
 import org.springblade.desk.dashboard.constant.DsPartConstant;
 import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity;
@@ -318,7 +315,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	@Override
 	public Boolean verifyYieldOrderCraft(YieldOrder yieldOrder) {
 		// 返工订单不进行校验
-		if (!StringUtils.isBlank(yieldOrder.getReworkCode())) {
+		if (StringUtils.isNotBlank(yieldOrder.getReworkCode())) {
 			return Boolean.TRUE;
 		}
 
@@ -343,7 +340,6 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 		PartCraftVO craftVO = dsPartService.selectPartCraft(partCode, roamNo, rankStr, null);
 		log.info("工艺返回：{}",craftVO != null);
 
-
 		if (ObjectUtil.isEmpty(craftVO) || PartCraftStatusEnum.SUCCESS.getCode() != craftVO.getCode()) {
 			String errMsg = "工艺匹配失败，原因：" + PartCraftStatusEnum.getMsg(craftVO.getCode());
 			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
@@ -369,6 +365,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 		yieldOrder.setYpArea(part.getArea() == null ? 0D : part.getArea());
 		yieldOrder.setPlate(part.getPlate());
 		yieldOrder.setCraftId(craft.getId());
+		yieldOrder.setRank(craft.getRank());
 		yieldOrder.setPartVersion(craft.getPartVersions());
 
 		List<DsProcessEntity> dsProcessEntityList = dsProcessService.selectDsProcessByCraftId(craft.getId());
@@ -1035,7 +1032,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			return DsCraftEnum.RANK_TWO.getCode();
 		}
 
-		// TODO 判定是否为镀金零件
+		// 判定是否为镀金零件
 		if (CommonConstant.BOOLEAN_TRUE.equals(part.getGoldMark())) {
 			// 获取零件工艺级别面积判定值
 			Integer levConfirmVal = 20;
@@ -1046,7 +1043,10 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 				if (totalArea > levConfirmVal) {
 					return DsCraftEnum.RANK_ONE.getCode();
 				} else {
-					// 若局部镀质量等级存在， 返回一级工艺
+					if (Func.isNotEmpty(yieldOrder.getProductIdent())) {
+						// 若局部镀质量等级存在， 返回一级工艺
+						return DsCraftEnum.RANK_ONE.getCode();
+					}
 				}
 			}
 		}