一键复制订单调整

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

@@ -2754,18 +2754,18 @@ public class Order extends Controller {
             if (enterpriseRowOld.isEmpty() || enterpriseRowNew.isEmpty()) {
                 return getErrReturnObject().setErrMsg("经销商不存在").toString();
             } else {
-                if (Enterprise.getEnterpriseGrade(this, row.getLong("sys_enterpriseid")).getGrade() != Enterprise.getEnterpriseGrade(this, sys_enterpriseid).getGrade() ||
-                        Enterprise.getEnterpriseGrade(this, row.getLong("sys_enterpriseid")).getPricegrade() != Enterprise.getEnterpriseGrade(this, sys_enterpriseid).getPricegrade()) {
-                    System.out.println("grade");
-                    flag = false;
-                }
+                //                if (Enterprise.getEnterpriseGrade(this, row.getLong("sys_enterpriseid")).getGrade() != Enterprise.getEnterpriseGrade(this, sys_enterpriseid).getGrade() ||
+//                        Enterprise.getEnterpriseGrade(this, row.getLong("sys_enterpriseid")).getPricegrade() != Enterprise.getEnterpriseGrade(this, sys_enterpriseid).getPricegrade()) {
+//                    System.out.println("grade");
+//                    flag = false;
+//                }
                 //企业领域
-                Rows tradefieldrowsOld = dbConnect.runSqlQuery("SELECT tradefield from sys_enterprise_tradefield WHERE sys_enterpriseid =" + row.getLong("sys_enterpriseid") + " and siteid ='" + siteid + "'");
-                Rows tradefieldrowsNew = dbConnect.runSqlQuery("SELECT tradefield from sys_enterprise_tradefield WHERE sys_enterpriseid =" + sys_enterpriseid + " and siteid ='" + siteid + "'");
-                if (!tradefieldrowsNew.containsAll(tradefieldrowsOld)) {
-                    System.out.println("tradefield");
-                    flag = false;
-                }
+//                Rows tradefieldrowsOld = dbConnect.runSqlQuery("SELECT tradefield from sys_enterprise_tradefield WHERE sys_enterpriseid =" + row.getLong("sys_enterpriseid") + " and siteid ='" + siteid + "'");
+//                Rows tradefieldrowsNew = dbConnect.runSqlQuery("SELECT tradefield from sys_enterprise_tradefield WHERE sys_enterpriseid =" + sys_enterpriseid + " and siteid ='" + siteid + "'");
+//                if (!tradefieldrowsNew.containsAll(tradefieldrowsOld)) {
+//                    System.out.println("tradefield");
+//                    flag = false;
+//                }
 
                 //企业营销类别
                 String itemclasssqlOld = "select itemclassid from plm_itemclass where siteid='" + siteid + "'";
@@ -2787,7 +2787,7 @@ public class Order extends Controller {
                 }
 
                 if (!flag) {
-                    return getErrReturnObject().setErrMsg("所选经销商经营范围和价格等级不一致，不允许复制").toString();
+                    return getErrReturnObject().setErrMsg("所选经销商经营范围不一致，不允许复制").toString();
                 }
             }