经销商增加字段

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

@@ -549,7 +549,7 @@ public class aftersalesmag extends Controller {
         }
         ArrayList<String> sqlList = new ArrayList<>();
         SQLFactory sqlFactoryupdate;
-        Rows departmenthrrows =dbConnect.runSqlQuery("select *from sys_departmenthrid where hrid="+hrid);
+        Rows departmenthrrows =dbConnect.runSqlQuery("select * from sys_departmenthrid where hrid="+hrid);
         if (ischeck) {
             InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "st_stockbill");
             long st_stockbillid = createTableID("st_stockbill");

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商修改.sql

@@ -14,6 +14,9 @@ set changeuserid=$changeuserid$,
     islimitaccessories=$islimitaccessories$,
     islimitorder=$islimitorder$,
     signingstate=$signingstate$,
-    delivery=$delivery$
+    delivery=$delivery$,
+    salearea=$salearea$,
+    paymans=$paymans$,
+    regiontype=$regiontype$,
 where siteid = $siteid$
   and sa_agentsid = $sa_agentsid$

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商列表查询.sql

@@ -22,7 +22,10 @@ select t1.sys_enterpriseid,
        t1.islimitaccessories,
        t1.islimitorder,
        t1.signingstate,
-       t1.delivery
+       t1.delivery,
+       t1.salearea,
+       t1.paymans,
+       t1.regiontype
 from sa_agents t1
          inner join sys_enterprise t2 on t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid
 where t1.siteid = $siteid$

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商新增.sql

@@ -1,6 +1,7 @@
 insert into sa_agents(siteid, sa_agentsid, sys_enterpriseid, createby, createdate, changeuserid,
                       changeby, changedate, agentnum, type, parentid,
-                      signdate, status, isservice,priceadjustment,entity,submitautocheck,presalesphonenumber,aftersalesphonenumber,islimitaccessories,islimitorder,signingstate,delivery)
+                      signdate, status, isservice,priceadjustment,entity,submitautocheck,presalesphonenumber,aftersalesphonenumber
+    ,islimitaccessories,islimitorder,signingstate,delivery,salearea,paymans,regiontype)
 select $siteid$,
        $sa_agentsid$,
        $sys_enterpriseid$,
@@ -23,4 +24,7 @@ select $siteid$,
        $islimitaccessories$,
        $islimitorder$,
        $signingstate$,
-       $delivery$
+       $delivery$,
+       $salearea$,
+       $paymans$,
+       $regiontype$

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商详情查询.sql

@@ -29,6 +29,9 @@ select t1.sys_enterpriseid,
        t2.presalesphonenumber,
        t2.aftersalesphonenumber,
        t2.delivery,
+       t2.salearea,
+       t2.paymans,
+       t2.regiontype,
        (SELECT enterprisename  FROM sys_enterprise WHERE sys_enterpriseid = (SELECT sys_enterpriseid FROM sa_agents WHERE sa_agentsid = t2.parentid)) parent_enterprisename,
        t4.erpagentnum,
        t2.isservice,

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

@@ -60,7 +60,7 @@ public class agents extends Controller {
 //        sqlFactory.addParameter("siteid", siteid);
 //        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_agents", "sys_enterpriseid", "isservice",
-                "sa_agentsid","agentnum","priceadjustment","type","signdate","createby","createdate","islimitaccessories","islimitorder","signingstate","delivery");
+                "sa_agentsid","agentnum","priceadjustment","type","signdate","createby","createdate","islimitaccessories","islimitorder","signingstate","delivery","salearea","paymans","regiontype");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid","enterprisename","abbreviation"
                 ,"contact","address","phonenumber","province","city","county","grade","saleclassauth");
@@ -136,6 +136,9 @@ public class agents extends Controller {
         long isallsale = content.getLongValue("isallsale");
         String entity = content.getStringValue("entity");
         String delivery = content.getStringValue("delivery");
+        String salearea = content.getStringValue("salearea");
+        String paymans = content.getStringValue("paymans");
+        String regiontype = content.getStringValue("regiontype");
 
 
         if (parentid != 0 && dbConnect.runSqlQuery("select * from sa_agents where siteid='" + siteid + "' and sa_agentsid=" + parentid).isEmpty()) {
@@ -188,6 +191,9 @@ public class agents extends Controller {
         sqlFactory.addParameter("islimitorder",islimitorder);
         sqlFactory.addParameter("signingstate",signingstate);
         sqlFactory.addParameter("delivery",delivery);
+        sqlFactory.addParameter("salearea",salearea);
+        sqlFactory.addParameter("paymans",paymans);
+        sqlFactory.addParameter("regiontype",regiontype);
 
 
         sqllist.add(sqlFactory.getSQL());
@@ -444,7 +450,7 @@ public class agents extends Controller {
             if (workaddress == 1) {
                 sqlFactory.addParameter("isdefault", isdefault);
                 if (isdefault) {
-                    sqllist.add("update sys_enterprise_contacts set isdefault=0 where contactsid !=" + contactsid + " and sys_enterpriseid=" + sys_enterpriseid);
+                    sqllist.add("update sys_enterprise_contacts set isdefault=0 where contactsid !=" + contactsid + " and sys_enterpriseid=" + sys_enterpriseid+" and type='"+type+"'");
                 }
             } else {
                 sqlFactory.addParameter("isdefault", 0);

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

@@ -707,7 +707,7 @@ public class OrderItems extends Controller {
         }
         if (type.equals("配件订单")) {
             querySQL.addJoinTable(JOINTYPE.left, "sa_workorder", "t5", "t1.sa_workorderid=t5.sa_workorderid and t1.siteid=t5.siteid");
-            querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t6", "t6.cardno=t1.cardno and t6.siteid=t1.siteid", "sku");
+            querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t6", "t6.cardno=t1.cardno and t6.siteid=t1.siteid", "sku","address");
             querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t7", "t7.itemid=t6.itemid and t7.siteid=t6.siteid");
         }
         querySQL.addQueryFields("candispatchqty", "ifnull(t2.candispatchqty, 0)");