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 dsProcessEntityList = dsProcessService.selectDsProcessByCraftId(craft.getId()); @@ -1035,7 +1032,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl levConfirmVal) { return DsCraftEnum.RANK_ONE.getCode(); } else { - // 若局部镀质量等级存在, 返回一级工艺 + if (Func.isNotEmpty(yieldOrder.getProductIdent())) { + // 若局部镀质量等级存在, 返回一级工艺 + return DsCraftEnum.RANK_ONE.getCode(); + } } } }