|
|
|
@ -267,7 +267,15 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie |
|
|
|
yieldStatusList.add(YieldOrderEnum.getEnum(entity.getStatus())); |
|
|
|
yieldStatusList.add(YieldOrderEnum.getEnum(entity.getStatus())); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
entity.setIsSinTerIng(true); |
|
|
|
boolean hasCondition = StringUtils.isNotEmpty(entity.getCardNo()) |
|
|
|
|
|
|
|
|| StringUtils.isNotEmpty(entity.getYpCode()) |
|
|
|
|
|
|
|
|| StringUtils.isNotEmpty(entity.getYoCode()) |
|
|
|
|
|
|
|
|| StringUtils.isNotEmpty(entity.getPartCode()) |
|
|
|
|
|
|
|
|| StringUtils.isNotEmpty(entity.getBatchNo()) |
|
|
|
|
|
|
|
|| StringUtils.isNotEmpty(entity.getRoamNo()) |
|
|
|
|
|
|
|
|| ObjectUtil.isNotEmpty(entity.getYieldType()) |
|
|
|
|
|
|
|
|| StringUtils.isNotEmpty(entity.getReworkCode()); |
|
|
|
|
|
|
|
entity.setIsSinTerIng(!hasCondition); |
|
|
|
|
|
|
|
|
|
|
|
List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList, yieldStatusList); |
|
|
|
List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList, yieldStatusList); |
|
|
|
|
|
|
|
|
|
|
|
|