排程数据组装优化

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

@@ -599,7 +599,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 ApsProcessOperationProcessEquDo hasEqu = null;
                 if(equDos != null && equDos.size()>0){
                     List<ApsProcessOperationProcessEquDo> equid = equDos.stream().filter(v -> v.getId().equals(process.getId())).collect(Collectors.toList());
-                    hasEqu = equid.get(0);
+                    if(equid != null && equid.size()>0){
+                        hasEqu = equid.get(0);
+                    }
                 }
                 // 非合并生产工序
                 if (process.getAluminumCoils() == null) {

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

@@ -694,6 +694,7 @@ public class ApsServiceImpl implements ApsService {
                 ProduceOrder produceOrder = new ProduceOrder(apsBlankOrderVo.getId(), apsBlankOrderVo.getMaterialname(), apsBlankOrderVo.getDeliverydate() == null ? null : DateUtil.offsetHour(apsBlankOrderVo.getDeliverydate(), apsBlankOrderVo.getDeliverytime() == null ? 0 : -apsBlankOrderVo.getDeliverytime()));
                 produceOrder.setMaxheatroll(apsBlankOrderVo.getMaxheatroll());
                 produceOrder.setOrderNo(apsBlankOrderVo.getBlanknumber());
+                produceOrder.setCustomerOrderId(apsBlankOrderVo.getProductionorderid());
                 // 期望交货天数
                 produceOrder.setExpecteddays(productionScheduleVo.getExpecteddays());
                 if(apsBlankOrderVo.getExpecteddays() != null && apsBlankOrderVo.getExpecteddays()>0){

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/ProduceOrder.java

@@ -37,6 +37,11 @@ public class ProduceOrder {
      */
     private String orderNo;
 
+    /**
+     * 客户订单ID
+     */
+    private String customerOrderId;
+
     /**
      * 交货日期
      */