Merge branch 'develop' into develop2

src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -375,19 +375,24 @@ public class aftersalesmag extends Controller {
             //对接erp生成erp发货单
             if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") ) {
                 ERPDocking erpDocking = new ERPDocking(siteid);
-                String result = erpDocking.createErpSareturn(rows.get(0), rowsdetail, this, sa_aftersalesmagid);
-                if (!result.equals("true")) {
-                    System.out.println(result);
-                    return getErrReturnObject().setErrMsg(result).toString();
+                if (!erpDocking.getUrl().isEmpty()) {
+                    String result = erpDocking.createErpSareturn(rows.get(0), rowsdetail, this, sa_aftersalesmagid);
+                    if (!result.equals("true")) {
+                        System.out.println(result);
+                        return getErrReturnObject().setErrMsg(result).toString();
+                    }
                 }
             }
         } else {
             if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") ) {
                 ERPDocking erpDocking = new ERPDocking(siteid);
-                String result = erpDocking.recheckErpSareturn(rows.get(0).getString("billno"), true, this, sa_aftersalesmagid);
-                if (!result.equals("true")) {
-                    return getErrReturnObject().setErrMsg(result).toString();
+                if (!erpDocking.getUrl().isEmpty()) {
+                    String result = erpDocking.recheckErpSareturn(rows.get(0).getString("billno"), true, this, sa_aftersalesmagid);
+                    if (!result.equals("true")) {
+                        return getErrReturnObject().setErrMsg(result).toString();
+                    }
                 }
+
             }
         }
         dbConnect.runSqlUpdate(sqlList);