Ver Fonte

作业的前道是铸轧或退火,必须填写流转等待最小时长

DLC há 4 meses atrás
pai
commit
f5972bf609

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

@@ -1256,7 +1256,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 if (apsProcessOperationDo.getMinflowwaitmin() == null) {
                     ApsProcessOperationDo preProcessOperationDo = apsProcessOperationList.stream().filter(pre -> pre.getId().equals(apsProcessOperationDo.getPreviousprocessid())).findAny().orElse(null);
                     List<String> zzctList = Arrays.asList("铸轧", "小卷成退", "中退", "成退");
-                    if (zzctList.contains(preProcessOperationDo.getProcess())) {
+                    if (preProcessOperationDo != null && zzctList.contains(preProcessOperationDo.getProcess())) {
                         return R.error(apsProcessOperationDo.getProcess() + apsProcessOperationDo.getProcessname() + "的前道是铸轧或退火,必须填写流转等待最小时长");
                     }
                 }