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