|
|
|
@ -143,21 +143,26 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public String dataVerify(List<Long> ids) { |
|
|
|
public String dataVerify(List<Long> ids) { |
|
|
|
// 先根据ID查询订单列表
|
|
|
|
// 先根据ID查询订单列表
|
|
|
|
|
|
|
|
log.info("先根据ID查询订单列表:{}",ids); |
|
|
|
LambdaQueryWrapper<YieldOrder> queryWrapper = Wrappers.lambdaQuery(YieldOrder.class).eq(YieldOrder::getIsDeleted, CommonConstant.DELETE_FALSE).in(YieldOrder::getId, ids); |
|
|
|
LambdaQueryWrapper<YieldOrder> queryWrapper = Wrappers.lambdaQuery(YieldOrder.class).eq(YieldOrder::getIsDeleted, CommonConstant.DELETE_FALSE).in(YieldOrder::getId, ids); |
|
|
|
List<YieldOrder> yieldOrderList = baseMapper.selectList(queryWrapper); |
|
|
|
List<YieldOrder> yieldOrderList = baseMapper.selectList(queryWrapper); |
|
|
|
|
|
|
|
|
|
|
|
// 遍历订单列表,根据异常钻状态,判断调用的校验方法
|
|
|
|
// 遍历订单列表,根据异常钻状态,判断调用的校验方法
|
|
|
|
|
|
|
|
log.info("遍历订单列表,根据异常钻状态,判断调用的校验方法"); |
|
|
|
for (YieldOrder yieldOrder : yieldOrderList) { |
|
|
|
for (YieldOrder yieldOrder : yieldOrderList) { |
|
|
|
if (YieldOrderEnum.VALIDATION_NO.getCode() == yieldOrder.getValidationResult() || YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCode() == yieldOrder.getValidationResult()) { |
|
|
|
if (YieldOrderEnum.VALIDATION_NO.getCode() == yieldOrder.getValidationResult() || YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCode() == yieldOrder.getValidationResult()) { |
|
|
|
// 进行数据校验,验证不通过,不进行后续验证,直接返回;
|
|
|
|
// 进行数据校验,验证不通过,不进行后续验证,直接返回;
|
|
|
|
|
|
|
|
log.info("进行数据校验,验证不通过,不进行后续验证,直接返回"); |
|
|
|
if (!this.verifyYieldOrderData(yieldOrder)) { |
|
|
|
if (!this.verifyYieldOrderData(yieldOrder)) { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
// 进行工艺校验,验证不通过,不进行后续验证,直接返回;
|
|
|
|
// 进行工艺校验,验证不通过,不进行后续验证,直接返回;
|
|
|
|
|
|
|
|
log.info("进行工艺校验,验证不通过,不进行后续验证,直接返回"); |
|
|
|
if (!this.verifyYieldOrderCraft(yieldOrder)) { |
|
|
|
if (!this.verifyYieldOrderCraft(yieldOrder)) { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
// 进行资源校验,验证不通过,不进行后续验证,直接返回;
|
|
|
|
// 进行资源校验,验证不通过,不进行后续验证,直接返回;
|
|
|
|
|
|
|
|
log.info("进行资源校验,验证不通过,不进行后续验证,直接返回;"); |
|
|
|
if (!this.verifyYieldOrderResource(yieldOrder)) { |
|
|
|
if (!this.verifyYieldOrderResource(yieldOrder)) { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -325,8 +330,10 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie |
|
|
|
rank = judgeRank(yieldOrder); |
|
|
|
rank = judgeRank(yieldOrder); |
|
|
|
} |
|
|
|
} |
|
|
|
String rankStr = rank == null ? null : String.valueOf(rank); |
|
|
|
String rankStr = rank == null ? null : String.valueOf(rank); |
|
|
|
|
|
|
|
log.info("工艺传参零件号:{},{},{}",partCode,roamNo,rankStr); |
|
|
|
PartCraftVO craftVO = dsPartService.selectPartCraft(partCode, roamNo, rankStr, null); |
|
|
|
PartCraftVO craftVO = dsPartService.selectPartCraft(partCode, roamNo, rankStr, null); |
|
|
|
|
|
|
|
log.info("工艺返回:{}",craftVO != null); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (ObjectUtil.isEmpty(craftVO) || PartCraftStatusEnum.SUCCESS.getCode() != craftVO.getCode()) { |
|
|
|
if (ObjectUtil.isEmpty(craftVO) || PartCraftStatusEnum.SUCCESS.getCode() != craftVO.getCode()) { |
|
|
|
String errMsg = "工艺匹配失败,原因:" + PartCraftStatusEnum.getMsg(craftVO.getCode()); |
|
|
|
String errMsg = "工艺匹配失败,原因:" + PartCraftStatusEnum.getMsg(craftVO.getCode()); |
|
|
|
@ -378,7 +385,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie |
|
|
|
yieldOrderCraft.setCaId(processEntity.getCaId()); |
|
|
|
yieldOrderCraft.setCaId(processEntity.getCaId()); |
|
|
|
yieldOrderCraftList.add(yieldOrderCraft); |
|
|
|
yieldOrderCraftList.add(yieldOrderCraft); |
|
|
|
} |
|
|
|
} |
|
|
|
yieldOrderCraftService.saveBatch(yieldOrderCraftList); |
|
|
|
boolean saveBatch = yieldOrderCraftService.saveBatch(yieldOrderCraftList); |
|
|
|
|
|
|
|
log.info("添加数据返回结果:{}",saveBatch); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return Boolean.TRUE; |
|
|
|
return Boolean.TRUE; |
|
|
|
|