浏览代码

对接erp仅限于正式站点

hu 2 年之前
父节点
当前提交
0593184c67

+ 6 - 6
src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -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);

+ 4 - 4
src/custom/restcontroller/webmanage/sale/dispatch/dispatch.java

@@ -430,7 +430,7 @@ public class dispatch extends Controller {
             }
         }
         //对接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.closeErpSainvoice(rows.get(0).getString("billno"),true,this,sa_dispatchid);
             if(!result.equals("true")){
@@ -511,7 +511,7 @@ public class dispatch extends Controller {
         RowsMap rowsMap = rowsOrderDetail.toRowsMap("sa_orderitemsid");
         for (Row row :rows) {
             //对接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.closeErpSainvoiceRow(row.getString("billno"),this,row.getLong("rowno"),row.getString("itemno"),row.getLong("sa_dispatchid"));
                 if(!result.equals("true")){
@@ -528,7 +528,7 @@ public class dispatch extends Controller {
         Rows sumcountRows =dbConnect.runSqlQuery("select count(1) sumcount from sa_dispatch_items where sa_dispatchid="+rows.get(0).getLong("sa_dispatchid") +" and siteid='"+siteid+"'");
         Rows closecountRows =dbConnect.runSqlQuery("select  count(1) closecount from sa_dispatch_items where sa_dispatchid="+rows.get(0).getLong("sa_dispatchid") +" and siteid='"+siteid+"' and isclose=1");
         if(sumcountRows.get(0).getLong("sumcount")==closecountRows.get(0).getLong("closecount")){
-            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.closeErpSainvoice(rows.get(0).getString("billno"),true,this,rows.get(0).getLong("sa_dispatchid"));
                 if(!result.equals("true")){
@@ -632,7 +632,7 @@ public class dispatch extends Controller {
             sqlList.add("update sa_dispatch set sa_orderid="+orderRows.get(0).getLong("sa_orderid")+" where siteid='" + siteid + "' and sa_dispatchid=" + sa_dispatchid);
         }
         //对接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.createErpSainvoice(rows.get(0),rowsdetail,this,sa_dispatchid);
             if(!result.equals("true")){

+ 2 - 2
src/custom/restcontroller/webmanage/sale/dispatch/dispatchItems.java

@@ -227,7 +227,7 @@ public class dispatchItems extends Controller {
         ERPDocking erpDocking = new ERPDocking();
         JSONArray jsonArray = new JSONArray();
         if (rows.toJsonArray("itemno").size() != 0) {
-            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
+            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
                 jsonArray = erpDocking.getErpIcinvbalRows(200000, 1, rows.toJsonArray("itemno"));
             }
 
@@ -327,7 +327,7 @@ public class dispatchItems extends Controller {
         ERPDocking erpDocking = new ERPDocking();
         JSONArray jsonArray = new JSONArray();
         if (rows.toJsonArray("itemno").size() != 0) {
-            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
+            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
                 jsonArray = erpDocking.getErpIcinvbalRows(200000, 1, rows.toJsonArray("itemno"));
             }
 

+ 1 - 1
src/custom/restcontroller/webmanage/sale/invbal/invbal.java

@@ -190,7 +190,7 @@ public class invbal extends Controller {
 		ERPDocking erpDocking =new ERPDocking();
 		JSONArray jsonArray =new JSONArray();
 		if(rows.toJsonArray("itemno").size()!=0){
-			if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
+			if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
 				jsonArray=erpDocking.getErpIcinvbalRows(200000, 1,rows.toJsonArray("itemno"));
 			}
 		}

+ 1 - 1
src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -286,7 +286,7 @@ public class Item extends Controller {
 
         ERPDocking erpDocking = new ERPDocking();
         JSONArray jsonArray =new JSONArray();
-        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
+        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
             if(!rows.toJsonArray("itemno").isEmpty()){
                 jsonArray=erpDocking.getErpIcinvbalRows(200000, 1,rows.toJsonArray("itemno"));
             }

+ 2 - 2
src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -519,7 +519,7 @@ public class OrderItems extends Controller {
         ERPDocking erpDocking = new ERPDocking();
         JSONArray jsonArray = new JSONArray();
         if (rows.toJsonArray("itemno").size() != 0) {
-            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
+            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
                 jsonArray = erpDocking.getErpIcinvbalRows(200000, 1, rows.toJsonArray("itemno"));
             }
         }
@@ -634,7 +634,7 @@ public class OrderItems extends Controller {
         ERPDocking erpDocking = new ERPDocking();
         JSONArray jsonArray = new JSONArray();
         if (rows.toJsonArray("itemno").size() != 0) {
-            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
+            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
                 jsonArray = erpDocking.getErpIcinvbalRows(200000, 1, rows.toJsonArray("itemno"));
             }
         }