Merge branch 'develop' into develop_green

src/custom/restcontroller/webmanage/sale/serviceorder/SQL/服务申请单新增.sql

@@ -1,4 +1,4 @@
 insert into sa_serviceorder (siteid, sa_serviceorderid,createuserid,createby, createdate, billno,billdate,changeuserid,changeby, changedate,
-                                sys_enterpriseid,sa_orderid,reason,remarks,servicetype,class1,class2,province,city,county,address,scenecontact,scenecontactrole,scenecontactphonenumber,begdate,enddate, status,saler_hrid,name,phonenumber,sa_customersid)
+                                sys_enterpriseid,sa_orderid,reason,remarks,servicetype,class1,class2,province,city,county,address,scenecontact,scenecontactrole,scenecontactphonenumber,begdate,enddate, status,saler_hrid,name,phonenumber,sa_customersid,isonlinesales)
 values ($siteid$, $sa_serviceorderid$,$userid$,$username$, CURRENT_TIME, $billno$,$billdate$,$userid$, $username$, CURRENT_TIME, $sys_enterpriseid$,$sa_orderid$,$reason$,$remarks$,$servicetype$,$class1$,$class2$,
-        $province$,$city$,$county$,$address$,$scenecontact$,$scenecontactrole$,$scenecontactphonenumber$,$begdate$,$enddate$,'新建',$saler_hrid$,$name$,$phonenumber$,$sa_customersid$);
+        $province$,$city$,$county$,$address$,$scenecontact$,$scenecontactrole$,$scenecontactphonenumber$,$begdate$,$enddate$,'新建',$saler_hrid$,$name$,$phonenumber$,$sa_customersid$,$isonlinesales$);

src/custom/restcontroller/webmanage/sale/serviceorder/SQL/服务申请单更新.sql

@@ -22,7 +22,8 @@ SET
     saler_hrid=$saler_hrid$,
     name=$name$,
     phonenumber=$phonenumber$,
-    sa_customersid=$sa_customersid$
+    sa_customersid=$sa_customersid$,
+    isonlinesales=$isonlinesales$
 WHERE sa_serviceorderid = $sa_serviceorderid$ and siteid=$siteid$
 
 

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

@@ -68,6 +68,7 @@ public class serviceorder extends Controller {
         String begdate = content.getStringValue("begdate");
         String enddate = content.getStringValue("enddate");
         long saler_hrid = content.getLongValue("saler_hrid");
+        boolean isonlinesales = content.getBooleanValue("isonlinesales");
 
         String sku = content.getStringValue("sku");
         String cardno = content.getStringValue("cardno");
@@ -149,6 +150,8 @@ public class serviceorder extends Controller {
         sqlFactory.addParameter("name", content.getStringValue("name"));
         sqlFactory.addParameter("phonenumber", content.getStringValue("phonenumber"));
         sqlFactory.addParameter("sa_customersid", content.getStringValue("sa_customersid"));
+        sqlFactory.addParameter("isonlinesales",isonlinesales);
+
 
         sqlList.add(sqlFactory.getSQL());
 
@@ -234,7 +237,7 @@ public class serviceorder extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t3", "t3.unitid=t2.unitid and t3.siteid=t2.siteid", "unitname");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.sa_agentsid=t1.sa_agentsid and t4.siteid=t1.siteid", "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid and t5.siteid=t4.siteid", "contact", "phonenumber", "address");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t6", "t6.sku=t1.sku and t6.siteid=t1.siteid", "cardno", "begdate", "enddate");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t6", "t6.sku=t1.sku and t6.siteid=t1.siteid", "cardno", "begdate", "enddate","isvoid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t7", "t6.sa_customersid=t7.sa_customersid and t6.siteid=t7.siteid", "sa_customersid");
         querySQL.addQueryFields("customername", "t7.name");
         querySQL.addQueryFields("customerphonenumber", "t7.phonenumber");
@@ -482,6 +485,9 @@ public class serviceorder extends Controller {
             if (whereObject.containsKey("sa_customersid") && !"".equals(whereObject.getString("sa_customersid"))) {
                 where.append(" and t1.sa_customersid ='").append(whereObject.getString("sa_customersid")).append("'");
             }
+            if (whereObject.containsKey("isonlinesales") && !"".equals(whereObject.getString("isonlinesales"))) {
+                where.append(" and t1.isonlinesales ='").append(whereObject.getString("isonlinesales")).append("' ");
+            }
             if (whereObject.containsKey("createuserid") && !"".equals(whereObject.getString("createuserid"))) {
                 where.append(" and t1.createuserid ='").append(whereObject.getString("createuserid")).append("'");
             }