班管家 2021-12-7 13:54

src/rest/openapi/restcontroller/hyworkorder/web/afterserviceorder/Afterserviceorder.java

@@ -406,13 +406,13 @@ public class Afterserviceorder extends Controller {
     /**获取应用系统**/
     public String get_appsystem(){
         DBConnect dbConnect=new DBConnect();
-        Rows rows = dbConnect.runSqlQuery("select value from PS_DATABIND_LIST where databindid='APPSYSTEM'");
+        Rows rows = dbConnect.runSqlQuery("select value from PS_DATABIND_LIST where databindid='APPSYSTEM' order by SEQUENCE");
         return getReturnObject_suc(rows,false).toString();
     }
     /**获取客诉大类**/
     public String errcategory(){
         DBConnect dbConnect=new DBConnect();
-        Rows rows = dbConnect.runSqlQuery("select value from PS_DATABIND_LIST where databindid='ERRCATEGORY'");
+        Rows rows = dbConnect.runSqlQuery("select value from PS_DATABIND_LIST where databindid='ERRCATEGORY' order by SEQUENCE");
         return getReturnObject_suc(rows,false).toString();
     }
 

src/rest/openapi/restcontroller/hyworkorder/web/workorder/SQL/工单工序查询.sql

@@ -5,7 +5,8 @@ select t.frownum,t.oneprocessname,t.twoprocessname,t.operating,convert(char(24),
        case when (
                      select top 1 t3.hyordernodeid  from hyordernode t3 where t3.fparentid=t.fparentid and t3.isconfirm=0 and t3.ischilden=0 order by t3.FROWNUM
                  )=t.hyordernodeid then '1' else '0' end fiscurrent,
-       t.ischilden
+       t.ischilden,
+       t.fstatus
 from hyordernode t
 left join hyworker t1 on t1.hyworkernum=t.operator and t1.siteid=$siteid$
 where EXISTS(select 1 from hyWorkorder t2 where t2.fworknum=$fworknum$ and  t2.hyWorkorderid=t.fparentid) and t.siteid=$siteid$