Merge remote-tracking branch 'origin/master'

master/src/main/java/com/ruoyi/project/invoice/controller/TInvoiceBookingworkticketController.java

@@ -490,6 +490,10 @@ public class TInvoiceBookingworkticketController extends BaseController
     {
         List<TInvoiceWorkcontent>  workcontentList = tInvoiceBookingworkticket.gettInvoiceWorkcontentList();
         if ("12".equals(workcontentList.get(0).getXpxp())) { //续票
+            TInvoiceWorkcontent tw = workcontentList.get(0);
+            if (StringUtils.isEmpty(tw.getGczyxkzh()) && StringUtils.isEmpty(tw.getDhzyxkzh()) && StringUtils.isEmpty(tw.getXzkjxkzh()) && StringUtils.isEmpty(tw.getMbzyxkzh()) && StringUtils.isEmpty(tw.getXzkjxkzh()) ) {
+                return AjaxResult.error("没有工作票号，无法预约");
+            }
            int i =  tInvoiceWorkcontentMapper.countXp(workcontentList.get(0));
             logger.info("预约票数量:" + i);
            if (i >= 15) {