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

src/apps/afterserviceorder/AfterserviceorderAppBean.java

@@ -2,6 +2,7 @@ package afterserviceorder;
 
 import baseclass.AppBeanCust;
 import hyworkorder.hyworkorder;
+import p2.util.P2AppException;
 import p2.util.P2Exception;
 import workorder.workorder;
 //afterserviceorder.AfterserviceorderAppBean
@@ -26,5 +27,24 @@ public class AfterserviceorderAppBean extends AppBeanCust {
         }
         return 1;
     }
+    
+    /**退回**/
+    public int SENDBACK() throws Exception {
+        this.SAVE();
+        afterserviceorder afterserviceorder = (afterserviceorder) getPao();
+        if (afterserviceorder.getString("fstatus").equals("待处理")) {
+        	if(afterserviceorder.getString("backreason")==null || afterserviceorder.getString("backreason").length()==0) {
+        		throw new P2AppException("","退回原因为空不可退回");
+        	}else {
+        		afterserviceorder.setValue("fstatus", "新建");
+			}
+        	 this.SAVE();
+             this.REFRESH();
+             byrefresh();
+        }else {
+        	throw new P2AppException("","非待处理不可退回");
+		}
+        return 1;
+    }
 
 }

src/apps/afterserviceorder/afterserviceorder.java

@@ -1,12 +1,14 @@
 package afterserviceorder;
 
 import baseclass.PaoCust;
+import baseclass.tools.GetFieldsName;
 import p2.p2server.P2Server;
 import p2.pao.PaoRemote;
 import p2.pao.PaoSet;
 import p2.pao.PaoSetRemote;
 import p2.util.P2AppException;
 import p2.util.P2Exception;
+import sysmsg.sysmsg;
 
 public class afterserviceorder extends PaoCust {
     /**
@@ -25,6 +27,18 @@ public class afterserviceorder extends PaoCust {
     @Override
     public void init() throws P2Exception {
         super.init();
+        try {
+            if (!toBeAdded() && getThisPaoSet().getApp() != null) {
+                if ("´ý´¦Àí".equals(getString("fstatus"))) {
+                	   setFieldFlag("backreason", READONLY, false);
+                }else {
+                	System.out.println(111);
+                	 setFieldFlag("backreason", READONLY, true);
+				}
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Override

src/apps/hyworker/hyworker.java

@@ -1,8 +1,12 @@
 package hyworker;
 
+import com.inet.pool.f;
+
 import baseclass.PaoCust;
 import baseclass.tools.GetFieldsName;
+import p2.p2server.P2Server;
 import p2.pao.PaoSet;
+import p2.pao.PaoSetRemote;
 import p2.util.P2AppException;
 import p2.util.P2Exception;
 
@@ -35,6 +39,21 @@ public class hyworker extends PaoCust {
     @Override
     public void fieldAction(Object paoField, String fieldname) throws P2Exception {
         super.fieldAction(paoField, fieldname);
+        if(fieldname.equalsIgnoreCase("HYWORKERNUM")){
+           String hrid=getString("HYWORKERNUM");
+           PaoSetRemote pp_hrs = P2Server.getP2Server().getPaoSet("pp_hr", P2Server.getP2Server().getSystemUserInfo());
+           pp_hrs.setWhere("siteid='HY' and hrid='"+hrid+"'");
+           pp_hrs.reset();
+           if(!pp_hrs.isEmpty()) {
+        	   if(pp_hrs.getPao(0).getString("DISPLAYNAME")!=null && pp_hrs.getPao(0).getString("DISPLAYNAME").length()!=0){
+        		setValue("fname", pp_hrs.getPao(0).getString("DISPLAYNAME"));   
+        	   }
+        	   if(pp_hrs.getPao(0).getString("PRIMARYPHONE")!=null && pp_hrs.getPao(0).getString("PRIMARYPHONE").length()!=0){
+           		setValue("WORKPHONE", pp_hrs.getPao(0).getString("PRIMARYPHONE"));   
+           	   }
+           }
+           
+        }
     }
 
     @Override

src/rest/openapi/restcontroller/hyworkorder/web/afterserviceorder/SQL/售后单列表查询.sql

@@ -2,6 +2,7 @@ select t.servicenum,convert(varchar,t.createdate,120)createdate,t.fsonum,t.fnote
        t.fprovince,
        t.fcity,
        t.fcounty,
-       t.faddress
+       t.faddress,
+       t.backreason
        from Afterserviceorder t
 where t.siteid=$siteid$ and t.fagentnum=$fagentnum$ and $where$

src/rest/openapi/restcontroller/hyworkorder/web/afterserviceorder/SQL/售后服务单详情.sql

@@ -1,4 +1,4 @@
 select t.servicenum,convert(varchar,t.createdate,120)createdate,t.fsonum,t.fnotes,t.fstatus,t.fprovince,t.fcity,t.fcounty,t.faddress,
-t.Afterserviceordeid ownerid,scenefname,scenephone,error_msg,t.appsystem,t.errcategory
+t.Afterserviceordeid ownerid,scenefname,scenephone,error_msg,t.appsystem,t.errcategory,t.backreason
 from Afterserviceorder t
 where t.servicenum=$servicenum$