合并工序订单列表

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -598,6 +598,13 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                                             processes.getNextProcessesIds().addAll(new ArrayList<>(Arrays.asList(processOperationM.getNextprocessid().split(","))));
                                         }
                                     }
+                                    // 所属订单
+                                    List<ProduceOrder> produceOrders = processes.getProduceOrder().stream().filter(v ->
+                                            v.getId().equals(processOperationM.getApsBlankOrderVo().getId())).collect(Collectors.toList());
+                                    if(produceOrders == null || produceOrders.size() == 0){
+                                        ProduceOrder produceOrder = new ProduceOrder(processOperationM.getApsBlankOrderVo().getId(),processOperationM.getApsBlankOrderVo().getMaterialname(),processOperationM.getApsBlankOrderVo().getDeliverydate());
+                                        processes.getProduceOrder().add(produceOrder);
+                                    }
                                     // 单次加工时长
                                     if(processes.getUnitProduceTime() == null){
                                         processes.setUnitProduceTime(processOperationM.getOnceprocessmin().intValue());
@@ -653,7 +660,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                                         processes.setOptionalEquipments(Arrays.asList(new String[]{aspCheckItem.getId()}));
                                         // 坯料计划订单
                                         ProduceOrder produceOrder = new ProduceOrder(processOperationM.getApsBlankOrderVo().getId(),processOperationM.getApsBlankOrderVo().getMaterialname(),processOperationM.getApsBlankOrderVo().getDeliverydate());
-                                        processes.setProduceOrder(Arrays.asList(new ProduceOrder[]{produceOrder}));
+                                        List<ProduceOrder> produceOrders = new ArrayList<>();
+                                        produceOrders.add(produceOrder);
+                                        processes.setProduceOrder(produceOrders);
 
                                         processes.setAluminumCoils(new ArrayList<>());
                                         for (int j=1;j<=haslast;j++){