订单业务员取对应经销商所在区域的业务员

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

@@ -154,13 +154,7 @@ public class Order extends Controller {
         //备注说明
         sqlFactory.addParameter("remarks", content.getStringValue("remarks"));
         //销售人员hrid,业务员hrid
-        if (content.containsKey("saler_hrid")) {
-            hrid = content.getLongValue("saler_hrid");
-        }
-        if (isAdd) {
-            //hrid = getSaleHrid(sys_enterpriseid);
-        }
-        sqlFactory.addParameter("saler_hrid", hrid);
+        sqlFactory.addParameter("saler_hrid", getSaleHrid(sys_enterpriseid));
         //制单方 1表示工厂方，0表示客户方
         if (usertype == 21 || usertype == 22) {
             sqlFactory.addParameter("createflag", 0);
@@ -365,9 +359,8 @@ public class Order extends Controller {
         //备注说明
         sqlFactory.addParameter("remarks", content.getStringValue("remarks"));
         //销售人员hrid,业务员hrid
-        hrid = getSaleHrid(sys_enterpriseid);
 
-        sqlFactory.addParameter("saler_hrid", hrid);
+        sqlFactory.addParameter("saler_hrid",  getSaleHrid(sys_enterpriseid));
         //制单方 1表示工厂方，0表示客户方
         if (usertype == 21 || usertype == 22) {
             sqlFactory.addParameter("createflag", 0);
@@ -1939,8 +1932,8 @@ public class Order extends Controller {
         sqlFactoryupdate.addParameter("recheckby", username);
         sqlList.add(sqlFactoryupdate.getSQL());
 
-        if(isrecheck && row.getString("type").equals("特殊订单")){
-            sqlList.add("update sa_order set typemx='特价' where sa_orderid="+sa_orderid+" and siteid='"+siteid+"'");
+        if (isrecheck && row.getString("type").equals("特殊订单")) {
+            sqlList.add("update sa_order set typemx='特价' where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'");
         }
 
         dbConnect.runSqlUpdate(sqlList);
@@ -3200,17 +3193,13 @@ public class Order extends Controller {
     }
 
     public Long getSaleHrid(Long sys_enterpriseid) throws YosException {
-        Rows rows = dbConnect.runSqlQuery("SELECT hrid from sys_enterprise_tradefield WHERE sys_enterpriseid = " + sys_enterpriseid + " and hrid is not null and siteid='" + siteid + "'");
-
-        if (rows.isNotEmpty()) {
-            hrid = rows.get(0).getLong("hrid");
-        }
+        Rows rows = dbConnect.runSqlQuery("SELECT t1.hrid FROM sa_salearea_hr t1 INNER JOIN sys_enterprise_tradefield t2 ON t1.sa_saleareaid=t2.sa_saleareaid AND t1.siteid=t2.siteid WHERE t2.sys_enterpriseid=" + sys_enterpriseid);
 
         if (rows.isNotEmpty()) {
-            hrid = rows.get(0).getLong("hrid");
+            return rows.get(0).getLong("hrid");
         }
 
-        return hrid;
+        return 0L;
     }
 
 

src/custom/restcontroller/webmanage/sale/toolbill/ToolBill.java

@@ -140,13 +140,7 @@ public class ToolBill extends Controller {
         //备注说明
         sqlFactory.addParameter("remarks", content.getStringValue("remarks"));
         //销售人员hrid,业务员hrid
-        if (content.containsKey("saler_hrid")) {
-            hrid = content.getLongValue("saler_hrid");
-        }
-        if (isAdd) {
-            hrid = new Order(content).getSaleHrid(sys_enterpriseid);
-        }
-        sqlFactory.addParameter("saler_hrid", hrid);
+        sqlFactory.addParameter("saler_hrid", new Order(content).getSaleHrid(sys_enterpriseid));
         //制单方 1表示工厂方，0表示客户方
         if (usertype == 21 || usertype == 22) {
             sqlFactory.addParameter("createflag", 0);