Jelajahi Sumber

aps-订单产品明细暂不评审校验逻辑修改

sucheng 2 bulan lalu
induk
melakukan
87b6d6c4d7

+ 9 - 1
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -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() + "的技术要求");
+                        }
+                    }
                 }
             }