Browse Source

返退对接erp增加判断

hu 1 year ago
parent
commit
75e453c1cf

+ 29 - 16
src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -474,12 +474,16 @@ public class aftersalesmag extends Controller {
             }
         }
         if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
+
             ERPDocking erpDocking =new ERPDocking(siteid);
-            String billno = rows.get(0).getString("billno");
-            String result =erpDocking.recheckErpSareturn(billno,false,this,sa_aftersalesmagid);
-            if(!result.equals("true")){
-                return getErrReturnObject().setErrMsg(result).toString();
+            if (!erpDocking.getUrl().isEmpty()) {
+                String billno = rows.get(0).getString("billno");
+                String result =erpDocking.recheckErpSareturn(billno,false,this,sa_aftersalesmagid);
+                if(!result.equals("true")){
+                    return getErrReturnObject().setErrMsg(result).toString();
+                }
             }
+
         }
         Long sa_cashbillid = 0L;
         if (rows.get(0).getString("type").equals("退货单")) {
@@ -598,11 +602,14 @@ public class aftersalesmag extends Controller {
         }
         if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") ) {
             ERPDocking erpDocking =new ERPDocking(siteid);
-            String billno = rows.get(0).getString("billno");
-            String result =erpDocking.recheckErpSareturn(billno,true,this,sa_aftersalesmagid);
-            if(!result.equals("true")){
-                return getErrReturnObject().setErrMsg(result).toString();
+            if (!erpDocking.getUrl().isEmpty()) {
+                String billno = rows.get(0).getString("billno");
+                String result =erpDocking.recheckErpSareturn(billno,true,this,sa_aftersalesmagid);
+                if(!result.equals("true")){
+                    return getErrReturnObject().setErrMsg(result).toString();
+                }
             }
+
         }
 
         Long sa_cashbillid = 0L;
@@ -677,11 +684,14 @@ public class aftersalesmag extends Controller {
         ArrayList<String> sqlList = new ArrayList<>();
         if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") ) {
             ERPDocking erpDocking = new ERPDocking(siteid);
-            String billno = rows.get(0).getString("billno");
-            String result = erpDocking.recheckErpSareturn(billno, true, this, sa_aftersalesmagid);
-            if (!result.equals("true")) {
-                return getErrReturnObject().setErrMsg(result).toString();
+            if (!erpDocking.getUrl().isEmpty()) {
+                String billno = rows.get(0).getString("billno");
+                String result = erpDocking.recheckErpSareturn(billno, true, this, sa_aftersalesmagid);
+                if (!result.equals("true")) {
+                    return getErrReturnObject().setErrMsg(result).toString();
+                }
             }
+
         }
 
 
@@ -770,11 +780,14 @@ public class aftersalesmag extends Controller {
 
         if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") ) {
             ERPDocking erpDocking = new ERPDocking(siteid);
-            String billno = rows.get(0).getString("billno");
-            JSONArray jsonArray = erpDocking.queryErpSareturn(billno);
-            if (!jsonArray.isEmpty()) {
-                return getErrReturnObject().setErrMsg("请在erp中删除该返退单后进行此反复核操作").toString();
+            if (!erpDocking.getUrl().isEmpty()) {
+                String billno = rows.get(0).getString("billno");
+                JSONArray jsonArray = erpDocking.queryErpSareturn(billno);
+                if (!jsonArray.isEmpty()) {
+                    return getErrReturnObject().setErrMsg("请在erp中删除该返退单后进行此反复核操作").toString();
+                }
             }
+
         }
 
         Long sa_cashbillid = 0L;