Merge remote-tracking branch 'Gogs/develop' into develop

src/apps/hyordernode/hyordernode.java

@@ -53,6 +53,13 @@ public class hyordernode extends PaoCust {
     }
     /**该节点是否可以确认**/
     public String fiscomplate() throws P2Exception {
+//        System.out.println("fiscomplate");
+        String str=(isNull("oneprocessname")?"":getString("oneprocessname"))+(isNull("twoprocessname")?"":getString("twoprocessname"));
+        PaoSetRemote hyflowworkset = getPaoSet("$HYFLOWWORK", "HYFLOWWORK", "workname='" + str + "'");
+//        if(!hyflowworkset.isEmpty()){
+//            System.out.println(hyflowworkset.getPao(0).getString("workname"));
+//        }
+
         if(!getBoolean("fiscomplete")){
             return "true";
         }
@@ -60,7 +67,7 @@ public class hyordernode extends PaoCust {
         String s = fisPreComplate();
         if(!s.equals("true"))return "存在"+s+"工序没有确认";
         //是否上传附件
-        if(getBoolean("fisupload")){
+        if(getBoolean("fisupload")&&!hyflowworkset.isEmpty()&&hyflowworkset.getPao(0).getBoolean("ffisupload")){
             PaoSetRemote doclinks =null;
 
             doclinks = P2Server.getP2Server().getPaoSet("tattachment", P2Server.getP2Server().getSystemUserInfo());
@@ -70,7 +77,7 @@ public class hyordernode extends PaoCust {
             if(doclinks.isEmpty())return "请填写完整工序内容:附件没有上传";
         }
         //是否添加物料
-        if(getBoolean("fisaddtitem")){
+        if(getBoolean("fisaddtitem")&&!hyflowworkset.isEmpty()&&hyflowworkset.getPao(0).getBoolean("ffisaddtitem")){
             PaoSetRemote workorder_titem = P2Server.getP2Server().getPaoSet("hyworkorder_titem", P2Server.getP2Server().getSystemUserInfo());
             workorder_titem.setInsertSite(getSite());
             workorder_titem.setWhere("fparentid="+getInt("fparentid")+" and sourcenode='"+String.valueOf(getInt("FROWNUM"))+"'");
@@ -78,11 +85,11 @@ public class hyordernode extends PaoCust {
             if(workorder_titem.isEmpty())return "请填写完整工序内容:没有添加物料";
         }
         //是否上传文本
-        if(getBoolean("fistext")){
+        if(getBoolean("fistext")&&!hyflowworkset.isEmpty()&&hyflowworkset.getPao(0).getBoolean("ffistext")){
             if(isNull("ftext"))return "请填写完整工序内容:没有添加文本";
         }
         //是否上传合同
-        if(getBoolean("fiscontract")){
+        if(getBoolean("fiscontract")&&!hyflowworkset.isEmpty()&&hyflowworkset.getPao(0).getBoolean("ffiscontract")){
             PaoSetRemote doclinks =null;
 
             doclinks = P2Server.getP2Server().getPaoSet("tattachment", P2Server.getP2Server().getSystemUserInfo());

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$

src/rest/openapi/restcontroller/hyworkorder/webapp/workorder/SQL/工单节点详情查询.sql

@@ -15,8 +15,14 @@ select t.frownum,(isnull(t.oneprocessname,'')+isnull(t.twoprocessname,'')) conte
        t.fiscontract,
        t.ftext,
        t.confirmation,
-       t.serverprice
+       t.serverprice,
+       t4.ffisupload,
+       t4.ffisaddtitem,
+       t4.ffistext,
+       t4.ffiscontract,
+       t4.ffisconfirmation
 from hyordernode t
          join hyWorkorder t3 on t3.hyWorkorderid=t.fparentid
          left join hyworker t1 on t1.hyworkernum=t.Operator
+         left join hyFlowwork t4 on t4.workname=isnull(t.oneprocessname,'')+isnull(twoprocessname,'') and t4.siteid=t.siteid
 where EXISTS(select 1 from hyWorkorder t2 where t2.fworknum=$fworknum$ and t2.hyWorkorderid=t.fparentid) and t.FROWNUM=$frownum$