ERP去掉站点限制

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

@@ -373,7 +373,7 @@ public class aftersalesmag extends Controller {
         sqlList.add(sqlFactoryupdate.getSQL());
         if (ischeck) {
             //对接erp生成erp发货单
-            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
+            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")) {
@@ -382,7 +382,7 @@ public class aftersalesmag extends Controller {
                 }
             }
         } else {
-            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
+            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")) {
@@ -464,7 +464,7 @@ public class aftersalesmag extends Controller {
                 sqlList.add("update sa_orderitems set returnqty=returnqty+" + returnqty + " where sa_orderitemsid=" + row.getString("sa_orderitemsid"));
             }
         }
-        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
+        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);
@@ -588,7 +588,7 @@ public class aftersalesmag extends Controller {
                 sqlList.add("update sa_orderitems set returnqty=returnqty-" + returnqty + " where sa_orderitemsid=" + row.getString("sa_orderitemsid"));
             }
         }
-        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
+        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);
@@ -667,7 +667,7 @@ public class aftersalesmag extends Controller {
         }
 
         ArrayList<String> sqlList = new ArrayList<>();
-        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
+        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);
@@ -760,7 +760,7 @@ public class aftersalesmag extends Controller {
 
         ArrayList<String> sqlList = new ArrayList<>();
 
-        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
+        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);

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

@@ -513,7 +513,7 @@ public class dispatch extends Controller {
             }
         }
         //对接erp生成erp发货单
-        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
+        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") ) {
             ERPDocking erpDocking = new ERPDocking(siteid);
             String result = erpDocking.closeErpSainvoice(rows.get(0).getString("billno"), true, this, sa_dispatchid);
             if (!result.equals("true")) {
@@ -600,7 +600,7 @@ public class dispatch extends Controller {
                 batchDeleteErr.addErr(row.getLong("sa_dispatch_itemsid"), "第" + row.getString("rowno") + "行的发货单明细已关闭，请勿重复关闭");
                 continue;
             }
-            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
+            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
                 ERPDocking erpDocking = new ERPDocking(siteid);
                 String result = erpDocking.closeErpSainvoiceRow(row.getString("billno"), this, row.getLong("rowno"), row.getString("itemno"), row.getLong("sa_dispatchid"));
                 if (!result.equals("true")) {
@@ -617,7 +617,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") && siteid.equalsIgnoreCase("ccyosg")) {
+            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") ) {
                 ERPDocking erpDocking = new ERPDocking(siteid);
                 String result = erpDocking.closeErpSainvoice(rows.get(0).getString("billno"), true, this, rows.get(0).getLong("sa_dispatchid"));
                 if (!result.equals("true")) {
@@ -748,7 +748,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") && siteid.equalsIgnoreCase("ccyosg")) {
+        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") ) {
             ERPDocking erpDocking = new ERPDocking(siteid);
             String result = erpDocking.createErpSainvoice(rows.get(0), rowsdetail, this, sa_dispatchid);
             if (!result.equals("true")) {

src/custom/restcontroller/webmanage/sale/dispatch/dispatchItems.java

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

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

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

src/custom/restcontroller/webmanage/sale/item/Item.java

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

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

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