11

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -1553,6 +1553,9 @@ public class DailyPlanServiceImpl implements DailyPlanService {
                 throw new RuntimeException("混炼生产订单BOM版本或者工艺路线版本不一致的不能合并！！");
             }
             String orderNo=sOTaskOrderHeaderMapper.getCombineOrderNo();
+            if(orderNo==null||"".equals(orderNo)){
+                throw new RuntimeException("未成功生成合并订单号请稍后重试！");
+            }
             ShopOrderData getLastShopOrder=sOTaskOrderHeaderMapper.getLastShopOrder(detailList.get(0).getSite(),taskNo);
             getLastShopOrder.setSite(detailList.get(0).getSite());
             getLastShopOrder.setOrderNo(orderNo);