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

src/rest/openapi/restcontroller/hyworkorder/web/workorder/HyWorkOrder.java

@@ -11,6 +11,8 @@ import openapi.base.data.db.DBConnect;
 import openapi.base.restful.WebClientRest;
 import org.apache.commons.lang.StringUtils;
 import org.sqlite.core.DB;
+
+import p2.p2server.P2Server;
 import p2.pao.PaoRemote;
 import p2.pao.PaoSetRemote;
 import p2.util.P2AppException;
@@ -233,15 +235,23 @@ public class HyWorkOrder extends Controller {
         String wherestr="1=1";
         if(where!=null){
             try {
-                PaoSetRemote workorderset = getpaoset("Workorder");
+            	PaoSetRemote workorderset = P2Server.getP2Server().getPaoSet("hyWorkorder",
+						P2Server.getP2Server().getSystemUserInfo());
                 workorderset.setInsertSite(siteid);
                 workorderset.setWhere("fworknum='"+where.getString("fworknum")+"'");
                 workorderset.reset();
                 if(!workorderset.isEmpty()){
-                    workorder workorderPao = (workorder)workorderset.getPao(0);
-                    workorderPao.setValue("fstatus", "渾羲宎",11l);
-                    workorderset.save();
-                    return getReturnObject_suc().toString();
+                	
+                    PaoRemote workorderPao = workorderset.getPao(0);
+                    if(workorderPao.getString("fstatus").equals("渾諉等")) {
+                    	 workorderPao.setValue("fstatus", "渾羲宎",11l);
+                         workorderset.save();
+                         return getReturnObject_suc().toString();
+                	}else {
+                		return getReturnObject_err("渾諉等袨怓狟符夔諉等").toString();
+					}
+                  
+                  
                 }
                 return getReturnObject_err("羶衄蜆馱等").toString();
             } catch (P2Exception e) {