工单工序顺序优化

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

@@ -680,7 +680,7 @@ public class serviceorder extends Controller {
         ArrayList sqList = new ArrayList<String>();
         Rows rows = dbConnect.runSqlQuery(
                 "select  t1.sa_workorder_template_worksid,t1.sequence,t1.parentid,t2.* from sa_workorder_template_works t1 inner join sa_workpreset t2 on t1.siteid=t2.siteid and t1.sa_workpresetid=t2.sa_workpresetid  where t1.siteid='"
-                        + siteid + "' and t1.sa_workorder_templateid =" + sa_workorder_templateid);
+                        + siteid + "' and t1.sa_workorder_templateid =" + sa_workorder_templateid +" order by t1.sequence asc");
         RowsMap rowsMap = rows.toRowsMap("parentid");
         if (!rowsMap.get(0).isEmpty()) {
             for (Row row : rowsMap.get(0)) {

src/custom/restcontroller/webmanage/sale/workorder/SQL/服务工单列表查询.sql

@@ -26,7 +26,8 @@ select  t1.*,
 		t9.spec,
         t10.enterprisename serviceenterprisename,
         t10.abbreviation serviceabbreviation,
-        t10.phonenumber servicephonenumber
+        t10.phonenumber servicephonenumber,
+        t11.agentnum serviceagentnum
         from  sa_workorder t1 
    left join sa_serviceorder t2 on t1.sa_serviceorderid=t2.sa_serviceorderid and t1.siteid=t2.siteid 
    left join sa_workorder_template t4 on t1.sa_workorder_templateid=t4.sa_workorder_templateid and t1.siteid=t4.siteid

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

@@ -1118,7 +1118,7 @@ public class workorder extends Controller {
         ArrayList sqList = new ArrayList<String>();
         Rows rows = dbConnect.runSqlQuery(
                 "select  t1.sa_workorder_template_worksid,t1.sequence,t1.parentid,t2.* from sa_workorder_template_works t1 inner join sa_workpreset t2 on t1.siteid=t2.siteid and t1.sa_workpresetid=t2.sa_workpresetid  where t1.siteid='"
-                        + siteid + "' and t1.sa_workorder_templateid =" + sa_workorder_templateid);
+                        + siteid + "' and t1.sa_workorder_templateid =" + sa_workorder_templateid+" order by t1.sequence asc");
         RowsMap rowsMap = rows.toRowsMap("parentid");
         if (!rowsMap.get(0).isEmpty()) {
             for (Row row : rowsMap.get(0)) {