海盐工单问题（删除作废工单,工单确认增加字段选择等）及班管家业务员未启用登录问题修复

src/apps/afterserviceorder/AfterserviceordeCreatewkDataBean.java

@@ -34,11 +34,11 @@ public class AfterserviceordeCreatewkDataBean  extends DataBeanCust{
 	            long l = afterserviceorder.createhyWorkorder(ftype);
 	       	     app.getAppBean().save();
 	       	
-	         this.sessionContext.queueRefreshEvent();
+	        // this.sessionContext.queueRefreshEvent();
 	       	    Utility.sendEvent(sessionContext, app.getCurrentPageId(),
 	  				"dialogclose", null);// ¹Ø±Õµ±Ç°¶Ô»°¿ò
-	       	  closeApp("AFTERORDER");
-		      openApp("AFTERORDER", pao.getUniqueIDValue());
+	       	 // closeApp("AFTERORDER");
+		      //openApp("AFTERORDER", pao.getUniqueIDValue());
 	         openApp("HYORDER",l);
 	       
 	         byrefresh();

src/apps/hyworkorder/hyworkorder.java

@@ -29,6 +29,17 @@ public class hyworkorder extends PaoCust {
 
 
     @Override
+	public void canDelete() throws P2Exception {
+		// TODO Auto-generated method stub
+		super.canDelete();
+		  if (!"作废".equals(getString("fstatus"))) {
+	            throw new P2AppException("", "非作废状态不可删除");
+	        }
+
+	}
+
+
+	@Override
     public void init() throws P2Exception {
         super.init();
         if(!toBeAdded()&&!getString("fstatus").equals("待开始")){

src/rest/openapi/base/restful/WebClientRest.java

@@ -804,7 +804,7 @@ public class WebClientRest {
                 return object.toString();
             }else if(usertype.equals("经销商员工账号")){//如果类型是经销商员工账号
                 Rows rows = connect.runSqlQuery(
-                        "select t1.fagentnum,t.defsite as siteid,t.hrid,t1.staffid,t1.fname,'0' fisservice from pp_users t join staff t1 on t1.phone=t.hrid " +
+                        "select t1.fisused,t1.fagentnum,t.defsite as siteid,t.hrid,t1.staffid,t1.fname,'0' fisservice from pp_users t join staff t1 on t1.phone=t.hrid and t1.siteid=t.defsite " +
                                 "where t.hrid='"+username+"' and t.status='ACTIVE'");
                 if (rows.isEmpty()) {
                     JSONObject object = new JSONObject();
@@ -812,7 +812,15 @@ public class WebClientRest {
                     object.put("errcode", ErrCode.gettokenfail[0]);
                     object.put("msg", "该帐号无登录权限！");
                     return object.toString();
-                }
+                }else {
+					if(!rows.get(0).getBoolean("fisused")){
+						JSONObject object = new JSONObject();
+	                    object.put("status", "error");
+	                    object.put("errcode", ErrCode.gettokenfail[0]);
+	                    object.put("msg", "该帐号没有启用！");
+	                    return object.toString();
+					}
+				}
 
                 String fagentnum=rows.get(0).getString("fagentnum");
                 String siteid=rows.get(0).getString("siteid");

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

@@ -139,11 +139,20 @@ public class HyWorkOrder extends Controller {
 					if (!workorder_team.isEmpty()) {
 						for (int i = 0; i < workorder_team.count(); i++) {
 							Row row = new Row();
-							// t.workername,t.ftype role,t.workephone workerllphone
-							row.put("workername", workorder_team.getPao(i).getString("workername"));
-							row.put("role", workorder_team.getPao(i).getString("ftype"));
-							row.put("workerllphone", workorder_team.getPao(i).getString("workephone"));
-							row.put("hyworkernum", workorder_team.getPao(i).getString("hyworkernum"));
+							if(workorderpao.getString("PROJECTLEADER").equals(workorder_team.getPao(i).getString("hyworkernum"))) {
+								row.put("workername", workorder_team.getPao(i).getString("workername"));
+								row.put("role", workorder_team.getPao(i).getString("ftype"));
+								row.put("workerllphone", workorder_team.getPao(i).getString("workephone"));
+								row.put("hyworkernum", workorder_team.getPao(i).getString("hyworkernum"));
+								row.put("fisdefault",1);
+							}else {
+								// t.workername,t.ftype role,t.workephone workerllphone
+								row.put("workername", workorder_team.getPao(i).getString("workername"));
+								row.put("role", workorder_team.getPao(i).getString("ftype"));
+								row.put("workerllphone", workorder_team.getPao(i).getString("workephone"));
+								row.put("hyworkernum", workorder_team.getPao(i).getString("hyworkernum"));
+								row.put("fisdefault",0);
+							}
 							rows_team.add(row);
 						}
 					}
@@ -907,11 +916,22 @@ public class HyWorkOrder extends Controller {
 				workorder.setWhere("fworknum='" + where.getString("fworknum") + "'");
 				workorder.reset();
 				if (!workorder.isEmpty()) {
-					PaoRemote pao = workorder.getPao(0);
+					hyworkorder pao = (hyworkorder) workorder.getPao(0);
+					PaoSetRemote paoSetRemote = pao.getPaoSet("AFTERSERVICEORDER");
 					pao.setValue("fisscenefname", true, 11l);
 					pao.setValue("fistitem", where.getString("fistitem"), 11l);
                     pao.setValue("fisperiod",where.getBoolean("fisperiod"),11l);
 					pao.setValue("fiserror", where.getString("fiserror"), 11l);
+					if(where.containsKey("appsystem")) {
+						if(!paoSetRemote.isEmpty()) {
+							paoSetRemote.getPao(0).setValue("appsystem", where.getString("appsystem"));
+						}
+					}
+					if(where.containsKey("errcategory")) {
+						if(!paoSetRemote.isEmpty()) {
+							paoSetRemote.getPao(0).setValue("errcategory", where.getString("errcategory"));
+						}
+					}
 					if (where.containsKey("repairprice")) {
 						pao.setValue("repairprice", where.getDouble("repairprice"), 11l);
 					}
@@ -1033,5 +1053,69 @@ public class HyWorkOrder extends Controller {
 		}
 		return getReturnObject_err("where参数不存在").toString();
 	}
+	/**售后应用系统列表**/
+    public String appsystemList(){
+        Rows rows=new Rows();
+        Row row1=new Row();
+        row1.put("value","暖通系统");
+        Row row2=new Row();
+        row2.put("value","消防系统");
+        Row row3=new Row();
+        row3.put("value","排水系统");
+        Row row4=new Row();
+        row4.put("value","引调水");
+        Row row5=new Row();
+        row5.put("value","制水厂");
+        Row row6=new Row();
+        row6.put("value","自来水管网");
+        Row row7=new Row();
+        row7.put("value","污水处理厂");
+        Row row8=new Row();
+        row8.put("value","其他");
+        
+        rows.add(row1);
+        rows.add(row2);
+        rows.add(row3);
+        rows.add(row4);
+        rows.add(row5);
+        rows.add(row6);
+        rows.add(row7);
+        rows.add(row8);
+
+        return getReturnObject_suc(rows,true).toString();
+    }
+    
+    /**客诉大类列表**/
+    public String errcategoryList(){
+        Rows rows=new Rows();
+        Row row1=new Row();
+        row1.put("value","内漏");
+        Row row2=new Row();
+        row2.put("value","外漏");
+        Row row3=new Row();
+        row3.put("value","性能失效");
+        Row row4=new Row();
+        row4.put("value","配件损坏或遗失");
+        Row row5=new Row();
+        row5.put("value","外观问题");
+        Row row6=new Row();
+        row6.put("value","异响或抖动");
+        Row row7=new Row();
+        row7.put("value","打不开/不通水");
+        Row row8=new Row();
+        row8.put("value","扭矩大");
+        Row row9=new Row();
+        row9.put("value","其他");
+        rows.add(row1);
+        rows.add(row2);
+        rows.add(row3);
+        rows.add(row4);
+        rows.add(row5);
+        rows.add(row6);
+        rows.add(row7);
+        rows.add(row8);
+        rows.add(row9);
+        return getReturnObject_suc(rows,true).toString();
+    }
 
 }

src/rest/openapi/restcontroller/hyworkorder/webapp/workorder/SQL/工单开始前确认.sql

@@ -1,2 +1,2 @@
-select fisscenefname,fistitem,fisperiod,fiserror,repairprice,errormsg,hyWorkorder.scenefname,hyWorkorder.scenephone,ftext,hyWorkorder.faddress,hyWorkorderid ownerid,AFTERSERVICEORDER.ERRCATEGORY from hyWorkorder  left join AFTERSERVICEORDER on AFTERSERVICEORDER.Servicenum=hyworkorder.servernum
+select fisscenefname,fistitem,fisperiod,fiserror,repairprice,errormsg,hyWorkorder.scenefname,hyWorkorder.scenephone,ftext,hyWorkorder.faddress,hyWorkorderid ownerid,AFTERSERVICEORDER.ERRCATEGORY,AFTERSERVICEORDER.APPSYSTEM from hyWorkorder  left join AFTERSERVICEORDER on AFTERSERVICEORDER.Servicenum=hyworkorder.servernum
 where hyWorkorder.fworknum=$fworknum$

src/rest/openapi/restcontroller/wechatapp/orderform/SQL/订单出货未付款账期统计查询.sql

@@ -1,6 +1,6 @@
 declare @siteid varchar(20)
 set @siteid = $siteid$
-select t1.fagentnum,fagentname,fagentshortname,pp_hr.displayname,t2.famount1,t3.famount2,t4.famount3,t5.famount4,t6.famount5,t7.famount6 ftotalamount from tagents t1 
+select t1.fagentnum,fagentname,fagentshortname,pp_hr.displayname,isnull(t2.famount1,0) famount1,isnull(t3.famount2,0) famount2,isnull(t4.famount3,0) famount3,isnull(t5.famount4,0) famount4,isnull(t6.famount5,0) famount5,isnull(t7.famount6,0) ftotalamount from tagents t1 
 inner join 
 (select t1.fagentnum,t1.fsaler,(t1.famount-t2.famount) famount6 from (
 select  t1.fagentnum,t1.fsaler,sum(t4.famount) famount from saorder t1

src/rest/openapi/restcontroller/wechatapp/orderform/SQL/订单出货未开票账期统计查询.sql

@@ -1,6 +1,6 @@
 declare @siteid varchar(20)
 set @siteid = $siteid$
-select t1.fagentnum,fagentname,fagentshortname,pp_hr.displayname,t2.famount1,t3.famount2,t4.famount3,t5.famount4,t6.famount5,t7.famount6 ftotalamount from tagents t1 
+select t1.fagentnum,fagentname,fagentshortname,pp_hr.displayname,isnull(t2.famount1,0) famount1,isnull(t3.famount2,0) famount2,isnull(t4.famount3,0) famount3,isnull(t5.famount4,0) famount4,isnull(t6.famount5,0) famount5,isnull(t7.famount6,0) ftotalamount from tagents t1 
 inner join 
 (select t1.fagentnum,t1.fsaler,(t1.famount-t2.famount) famount6 from (
 select  t1.fagentnum,t1.fsaler,sum(t4.famount) famount from saorder t1

src/rest/openapi/restcontroller/wechatapp/orderform/SQL/订单审核未收款账期统计查询.sql

@@ -1,6 +1,6 @@
 declare @siteid varchar(20)
 set @siteid = $siteid$
-select t1.fagentnum,fagentname,fagentshortname,pp_hr.displayname,t2.famount1,t3.famount2,t4.famount3,t5.famount4,t6.famount5,t7.famount6 ftotalamount from tagents t1 
+select t1.fagentnum,fagentname,fagentshortname,pp_hr.displayname,isnull(t2.famount1,0) famount1,isnull(t3.famount2,0) famount2,isnull(t4.famount3,0) famount3,isnull(t5.famount4,0) famount4,isnull(t6.famount5,0) famount5,isnull(t7.famount6,0) ftotalamount from tagents t1 
 inner join
 (select fsaler,t1.fagentnum,sum(t2.frateamount-isnull(t2.fwriteoffamount,0))famount6 from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid

src/rest/openapi/restcontroller/wechatapp/orderform/SQL/订单开票未收款账期统计查询.sql

@@ -1,6 +1,6 @@
 declare @siteid varchar(20)
 set @siteid =$siteid$
-select t1.fagentnum,fagentname,fagentshortname,pp_hr.displayname,t2.famount1,t3.famount2,t4.famount3,t5.famount4,t6.famount5,t7.famount6 ftotalamount from tagents t1 
+select t1.fagentnum,fagentname,fagentshortname,pp_hr.displayname,isnull(t2.famount1,0) famount1,isnull(t3.famount2,0) famount2,isnull(t4.famount3,0) famount3,isnull(t5.famount4,0) famount4,isnull(t6.famount5,0) famount5,isnull(t7.famount6,0) ftotalamount from tagents t1 
 inner join 
 (select fsaler,t1.fagentnum,sum(isnull(t2.finvoiceamount,0)-isnull(t2.fwriteoffamount,0)) famount6 from saorder t1
 inner join saorderdetail t2 on t1.siteid=t2.siteid and t1.saorderid=t2.fparentid