Merge remote-tracking branch 'origin/develop' into develop-yellow

src/custom/restcontroller/webmanage/sale/paybill/Paybill.java

@@ -253,6 +253,11 @@ public class Paybill extends Controller {
         } else {
             return getErrReturnObject().setErrMsg("未填写会计日期").toString();
         }
+
+        if (dbConnect.runSqlQuery("SELECT 1 from sa_paybilldetail WHERE sa_paybillid=" + sa_paybillid).isEmpty()) {
+            return getErrReturnObject().setErrMsg("打款明细为空").toString();
+        }
+
         SQLFactory sqlFactory = new SQLFactory(this, "打款凭证审核");
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("sa_paybillid", sa_paybillid);