Merge remote-tracking branch 'origin/master'

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -20,10 +20,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;
@@ -324,7 +321,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;
 		}
 
@@ -349,7 +346,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());
@@ -375,6 +371,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());
@@ -1111,7 +1108,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			return DsCraftEnum.RANK_TWO.getCode();
 		}
 
-		// TODO 判定是否为镀金零件
+		// 判定是否为镀金零件
 		if (CommonConstant.BOOLEAN_TRUE.equals(part.getGoldMark())) {
 			// 获取零件工艺级别面积判定值
 			Integer levConfirmVal = 20;
@@ -1122,7 +1119,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();
+					}
 				}
 			}
 		}