楚楚调整

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

@@ -43,15 +43,15 @@ public class OrderItemsHelper extends BaseClass {
 
         Long sa_accountclassid = content.getLong("sa_accountclassid");
 
-//        if ((type.equals("标准订单") || type.equals("特殊订单")) && sa_accountclassid > 0) {
-//            return sa_accountclassid;
-//        }
-        if ((type.equals("标准订单") || type.equals("特殊订单")) && content.getString("tradefield").equals("GC工程")) {
-            return 69L;
-        }
-        if ((type.equals("标准订单") || type.equals("特殊订单")) && content.getString("tradefield").equals("整装工程")) {
-            return 96L;
+        if ((type.equals("标准订单") || type.equals("特殊订单")) && sa_accountclassid > 0) {
+            return sa_accountclassid;
         }
+//        if ((type.equals("标准订单") || type.equals("特殊订单")) && content.getString("tradefield").equals("GC工程")) {
+//            return 69L;
+//        }
+//        if ((type.equals("标准订单") || type.equals("特殊订单")) && content.getString("tradefield").equals("整装工程")) {
+//            return 96L;
+//        }
         if (type.equals("促销订单")) {
             Rows accountclassRows = dbConnect.runSqlQuery("select sa_accountclassid from sa_promotion where siteid='" + controller.siteid + "' and sa_promotionid=" + content.getLongValue("sa_promotionid"));
             if (!accountclassRows.isEmpty()) {

src/custom/utility/ERPDocking.java

@@ -33,8 +33,8 @@ public class ERPDocking {
             url = "http://192.168.3.89:8001/rest/ws_v2/basicDrp";
         }
         if (siteid.equalsIgnoreCase("CCYOSG")) {
-//            url = "http://192.168.3.89:8009/rest/ws_v2/basicDrp";
-            url = "http://124.71.196.182:8001/rest/ws_v2/basicDrp";
+            url = "http://192.168.3.89:8009/rest/ws_v2/basicDrp";
+//            url = "http://124.71.196.182:8001/rest/ws_v2/basicDrp";
         }
         System.err.println(siteid + ":" + url);
     }