|
|
@@ -348,7 +348,7 @@ public class aftersalesmag extends Controller {
|
|
|
sqlList.add(sqlFactoryupdate.getSQL());
|
|
|
if (ischeck) {
|
|
|
//对接erp生成erp发货单
|
|
|
- if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
|
|
|
+ if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
|
|
|
ERPDocking erpDocking =new ERPDocking();
|
|
|
String result =erpDocking.createErpSareturn(rows.get(0),rowsdetail,this,sa_aftersalesmagid);
|
|
|
if(!result.equals("true")){
|
|
|
@@ -357,7 +357,7 @@ public class aftersalesmag extends Controller {
|
|
|
}
|
|
|
}
|
|
|
}else{
|
|
|
- if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
|
|
|
+ if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
|
|
|
ERPDocking erpDocking =new ERPDocking();
|
|
|
String result =erpDocking.recheckErpSareturn(rows.get(0).getString("billno"),true,this,sa_aftersalesmagid);
|
|
|
if(!result.equals("true")){
|
|
|
@@ -398,7 +398,7 @@ public class aftersalesmag extends Controller {
|
|
|
}
|
|
|
|
|
|
ArrayList<String> sqlList = new ArrayList<>();
|
|
|
- if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
|
|
|
+ if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
|
|
|
ERPDocking erpDocking =new ERPDocking();
|
|
|
String billno = rows.get(0).getString("billno");
|
|
|
String result =erpDocking.recheckErpSareturn(billno,false,this,sa_aftersalesmagid);
|
|
|
@@ -491,7 +491,7 @@ public class aftersalesmag extends Controller {
|
|
|
}
|
|
|
|
|
|
ArrayList<String> sqlList = new ArrayList<>();
|
|
|
-// if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
|
|
|
+// if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
|
|
|
// ERPDocking erpDocking =new ERPDocking();
|
|
|
// String billno = rows.get(0).getString("billno");
|
|
|
// String result =erpDocking.recheckErpSareturn(billno,true,this,sa_aftersalesmagid);
|
|
|
@@ -564,7 +564,7 @@ public class aftersalesmag extends Controller {
|
|
|
}
|
|
|
|
|
|
ArrayList<String> sqlList = new ArrayList<>();
|
|
|
- if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
|
|
|
+ if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
|
|
|
ERPDocking erpDocking =new ERPDocking();
|
|
|
String billno = rows.get(0).getString("billno");
|
|
|
String result =erpDocking.recheckErpSareturn(billno,true,this,sa_aftersalesmagid);
|
|
|
@@ -657,7 +657,7 @@ public class aftersalesmag extends Controller {
|
|
|
|
|
|
ArrayList<String> sqlList = new ArrayList<>();
|
|
|
|
|
|
- if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
|
|
|
+ if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
|
|
|
ERPDocking erpDocking =new ERPDocking();
|
|
|
String billno = rows.get(0).getString("billno");
|
|
|
JSONArray jsonArray =erpDocking.queryErpSareturn(billno);
|