|
@@ -417,7 +417,15 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
|
|
|
for (String nowOrderDetailId : nowOrderDetailIdList) {
|
|
|
if (!technicalHaveDetailIdList.contains(nowOrderDetailId)) {
|
|
|
ApsProductDetailVo apsProductDetailVo = apsProductDetailVoList.stream().filter(item -> item.getId().equals(nowOrderDetailId)).findFirst().orElse(null);
|
|
|
- return R.error("请填写" + apsProductDetailVo.getInputmaterialdescription() + "的技术要求");
|
|
|
+ if (apsProductDetailVo != null) {
|
|
|
+ String notyetreview = "否";
|
|
|
+ if (StringUtils.isNotBlank(apsProductDetailVo.getNotyetreview())) {
|
|
|
+ notyetreview = apsProductDetailVo.getNotyetreview();
|
|
|
+ }
|
|
|
+ if (notyetreview.equals("否")) {
|
|
|
+ return R.error("请填写" + apsProductDetailVo.getInputmaterialdescription() + "的技术要求");
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|