2 Revize 7088a7c635 ... cda6306adb

Autor SHA1 Zpráva Datum
  fangpy cda6306adb Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit před 1 měsícem
  fangpy a67691dd1e 首道工序是小卷成退的bug修改 před 1 měsícem

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

@@ -1788,7 +1788,11 @@ public class ApsServiceImpl implements ApsService {
 //                        ApsProcessOperationDo preprocess = apsProcessOperationService.getById(previousprocessid);
                         ApsProcessOperationDo preprocess = baseApsProcessOperationList.stream().filter(item -> item.getId().equals(previousprocessid)).findFirst().orElse(null);
                         processes.setMinThPcNum(processDetail.getPlanprocessrall());
-                        processes.setProducePcNum(preprocess.getPlanprocessrall());
+                        if(preprocess != null){
+                            processes.setProducePcNum(preprocess.getPlanprocessrall());
+                        }else{
+                            processes.setProducePcNum(1);
+                        }
                     }
                     if (apsBlankOrderVo.getPlanhavematerialdate() != null
                             && apsBlankOrderVo.getPlanhavematerialdate().compareTo(productionScheduleVo.getApsPlanStartDate())>0) {