修改工作台订单接收

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

@@ -289,7 +289,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	@Override
 	public Boolean createSubOrder(YieldOrder yieldOrder) {
 		// 4. 如果是烧结订单并且不是返工单据，则需要验证子件清单是否存在，存在跳过，不存在则新增
-		if (YieldOrderEnum.YIELD_TYPE_2.equals(yieldOrder.getYieldType())
+		if (yieldOrder.getYieldType().equals(YieldOrderEnum.YIELD_TYPE_2.getCode())
 			&& StringUtils.isBlank(yieldOrder.getReworkCode())) {
 			//验证订单是否存在当前B号，如果不存在则不能下发
 			if (StringUtils.isBlank(yieldOrder.getRoamNo())) {
@@ -585,9 +585,9 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			this.updateById(yieldOrder);
 			return Boolean.FALSE;
 		}
-		yieldOrder.setReceiveTime(new Date());
+//		yieldOrder.setReceiveTime(new Date());
-		yieldOrder.setReceiveUser(AuthUtil.getUserId());
+//		yieldOrder.setReceiveUser(AuthUtil.getUserId());
-		yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_YES.getCode());
+//		yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_YES.getCode());
 		if(yieldOrder.getYieldType() != YieldOrderEnum.YIELD_TYPE_2.getCode()){
 			yieldOrder.setStatus(YieldOrderEnum.STATUS_APS.getCode());
 		}
@@ -1131,10 +1131,24 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	@Override
 	public List<YieldOrderCraft> confirm(String cardNo,String mark) {
 		YieldOrder yieldOrder = this.getOne(Wrappers.<YieldOrder>lambdaQuery().eq(YieldOrder::getCardNo,cardNo));
-		if(yieldOrder != null){
+		if(null == yieldOrder){
+			throw new ServiceException("未找到订单（"+cardNo+"）！");
+		}
 		if("1".equals(mark)){
 			yieldOrder.setSiteWork(true);
 		}
+
+		// 接收订单前置
+		yieldOrder.setReceiveTime(new Date());
+		yieldOrder.setReceiveUser(AuthUtil.getUserId());
+		yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_YES.getCode());
+		this.updateById(yieldOrder);
+
+		// 校验合规性校验是否通过
+		if(!yieldOrder.getValidationResult().equals(YieldOrderEnum.VALIDATION_RESULT_PASS.getCode())){
+			throw new ServiceException("订单接收成功，校验异常请及时处理");
+		}
+
 		boolean result = this.verifyYieldOrderResource(yieldOrder);
 		if(result){
 			List<YieldOrderCraft> list = yieldOrderCraftService.list(Wrappers.<YieldOrderCraft>lambdaQuery().eq(YieldOrderCraft::getYoId,yieldOrder.getId()));
@@ -1145,10 +1159,10 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 				}
 			});
 			return list;
+		}else {
+			throw new ServiceException("订单接收成功，分派异常请及时处理");
 		}
 	}
-		return new ArrayList<>();
-	}
 
 	/**
 	 * 验证零件子件信息