|
@@ -1445,7 +1445,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
//产品明细
|
|
//产品明细
|
|
List<ApsProductDetailDo> apsProductDetailDoList = req.getApsProductDetailDoList();
|
|
List<ApsProductDetailDo> apsProductDetailDoList = req.getApsProductDetailDoList();
|
|
//输出成品
|
|
//输出成品
|
|
- List<ApsProcessOutputProductDo> apsProcessOutputProductDoList = req.getApsProcessOutputProductDoList().stream().filter(item->item.getDeleted().equals("0")).collect(Collectors.toList());
|
|
|
|
|
|
+ List<ApsProcessOutputProductDo> apsProcessOutputProductDoList = req.getApsProcessOutputProductDoList().stream().filter(item -> ObjectUtil.isEmpty(item.getDeleted()) || item.getDeleted().equals("0")).collect(Collectors.toList());
|
|
|
|
|
|
//如果坯料计划未开工(生产状态<=30)
|
|
//如果坯料计划未开工(生产状态<=30)
|
|
if (apsBlankOrderDo.getProductstatus().compareTo(TO_BE_STARTED) <= 0) {
|
|
if (apsBlankOrderDo.getProductstatus().compareTo(TO_BE_STARTED) <= 0) {
|