台州短信，经销商消息及作废工单不显示更新

src/apps/afterserviceorder/AfterserviceordeCreatewkDataBean.java

@@ -32,13 +32,20 @@ public class AfterserviceordeCreatewkDataBean  extends DataBeanCust{
 		 if (afterserviceorder != null) {
 			 System.out.println(888);
 	            long l = afterserviceorder.createhyWorkorder(ftype);
+	            PaoSetRemote paoSetRemote =afterserviceorder.getPaoSet("HYWORKORDER");
 	            if(afterserviceorder.getSite().equals("TZ")) {
 	    			/** 给经销商发送消息 **/
 	              PaoSetRemote paoSet = afterserviceorder.getPaoSet("$workermassage", "workermassage", "");
 	              PaoRemote remote = paoSet.addAtEnd();
 	              remote.setValue("ftype","经销商消息",11l);
-	              remote.setValue("title","服务申请单："+afterserviceorder.getString("Servicenum")+"已转成工单",11l);
-	              remote.setValue("content","服务申请单："+afterserviceorder.getString("Servicenum")+"已转成工单",11l);
+	              if(paoSetRemote.isEmpty()) {
+	            	  remote.setValue("title","服务申请单："+afterserviceorder.getString("Servicenum")+"已转成工单",11l);
+		              remote.setValue("content","服务申请单："+afterserviceorder.getString("Servicenum")+"已转成工单",11l);
+	              }else {
+	            	  remote.setValue("title","服务申请单："+afterserviceorder.getString("Servicenum")+"已转成工单"+paoSetRemote.getPao(0).getString("fworknum"),11l);
+		              remote.setValue("content","服务申请单："+afterserviceorder.getString("Servicenum")+"已转成工单"+paoSetRemote.getPao(0).getString("fworknum"),11l);
+				}
+	             
 	              remote.setValue("phone",afterserviceorder.getString("fagentnum"),11l);
 	    		}
 	       	     app.getAppBean().save();

src/apps/afterserviceorder/afterserviceorder.java

@@ -136,6 +136,7 @@ public class afterserviceorder extends PaoCust {
         remote.setValue("errormsg",getString("error_msg"),11l);
         remote.setValue("ftext",getString("fnotes"),11l);
         remote.setValue("ftype",ftype,11l);
+   
         String fsonum=getString("fsonum");
         DBConnect connect = new DBConnect();
         SQLFactory factory = null;

src/apps/hyworkorder/hyworkorder.java

@@ -18,6 +18,9 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.Vector;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang.StringUtils;
 
 import com.sun.org.apache.xpath.internal.operations.And;
 
@@ -55,9 +58,9 @@ public class hyworkorder extends PaoCust {
 		super.add();
 
 		setValue("fworknum", getBillNum("HYORDER"), 11l);
-		if(getSite().equals("HY")) {
+		if (getSite().equals("HY")) {
 			setValue("fstatus", "待开始", 11l);
-		}else if(getSite().equals("TZ")) {
+		} else if (getSite().equals("TZ")) {
 			setValue("fstatus", "待接单", 11l);
 		}
 		setValue("progress", 0, 11l);
@@ -119,12 +122,12 @@ public class hyworkorder extends PaoCust {
 					System.out.println(333);
 					int index = 0;
 					for (int i = 0; i < templatenode.count(); i++) {
-						
+
 						PaoRemote pao = templatenode.getPao(i);
 						System.out.println(pao.getString("oneprocessname"));
 						PaoSetRemote templatenode2 = pao.getPaoSet("hytemplatenode2");
 						if (templatenode2.isEmpty()) {
-							
+
 							PaoRemote remote = ordernode.addAtEnd();
 							remote.setValue("FROWNUM", ++index, 11l);
 							remote.setValue("oneprocessname", pao.getString("oneprocessname"), 11l);
@@ -178,7 +181,8 @@ public class hyworkorder extends PaoCust {
 								remote2.setValue("fiscontract", templatenode2_pao.getString("fiscontract"), 11l);
 								remote2.setValue("FISCOMPLETE", templatenode2_pao.getString("FISCOMPLETE"), 11l);
 								remote2.setValue("FISADDTRAINING", templatenode2_pao.getString("FISADDTRAINING"), 11l);
-								remote2.setValue("FISADDTRAININGTITEM", templatenode2_pao.getString("FISADDTRAININGTITEM"), 11l);
+								remote2.setValue("FISADDTRAININGTITEM",
+										templatenode2_pao.getString("FISADDTRAININGTITEM"), 11l);
 								remote2.setValue("FISPAID", templatenode2_pao.getString("FISPAID"), 11l);
 							}
 						}
@@ -201,36 +205,72 @@ public class hyworkorder extends PaoCust {
 				remote.setValue("hyworkernum", getString("PROJECTLEADER"), 2l);
 			}
 			try {
-			    PaoSetRemote hyworker = P2Server.getP2Server().getPaoSet("hyworker", P2Server.getP2Server().getSystemUserInfo());
-			    PaoSetRemote tagents = P2Server.getP2Server().getPaoSet("tagents", P2Server.getP2Server().getSystemUserInfo());
-			    PaoSetRemote afterserviceorder = P2Server.getP2Server().getPaoSet("AFTERSERVICEORDER", P2Server.getP2Server().getSystemUserInfo());
-			    afterserviceorder.setWhere("SERVICENUM='"+getString("SERVERNUM")+"'");
-			    tagents.setWhere("FAGENTNUM='"+getString("FAGENTNUM")+"'");
-			    hyworker.setWhere("HYWORKERNUM ='" + getString("PROJECTLEADER") + "'");
-			    hyworker.reset();
-			    if(!hyworker .isEmpty() && getSite().equals("HY")){
-			        String submitby = afterserviceorder.getPao(0).getString("SUBMITBY");
-			        String phone = hyworker.getPao(0).getString("WORKPHONE");
-			        String fagentshortname = tagents.getPao(0).getString("FAGENTSHORTNAME");
-			        HttpURLRest rest = new HttpURLRest("http://smssh1.253.com/msg/v1/send/json");
-			        rest.addHeader("Content-type", "application/json");
-			        org.json.JSONObject jsonObject = new org.json.JSONObject();
-			        jsonObject.put("account", "N3147701");
-			        jsonObject.put("password", "4ClGyab6fv6a87");
-			        jsonObject.put("msg", "【Banninger】工单号：" + getString("FWORKNUM") + "已指派请处理，客户名称："+fagentshortname+",提交人："+submitby+"，备注："+getString("FNOTES"));
-			        jsonObject.put("phone", phone);
-			        rest.addRawBody(jsonObject.toString());
-			        String s = rest.post();
-			        PaoSetRemote verCodehistory = P2Server.getP2Server().getPaoSet("VerCodehistory", P2Server.getP2Server().getSystemUserInfo());
-			        PaoRemote remote = verCodehistory.addAtEnd();
-			        remote.setValue("phone", phone);
-			        remote.setValue("msg", "【Banninger】工单号：" + getString("FWORKNUM") + "已指派请处理，客户名称："+fagentshortname+",提交人："+submitby+"，备注："+getString("FNOTES"));
-			        remote.setValue("content", s);
-			        verCodehistory.save();
-			    }
+				PaoSetRemote hyworker = P2Server.getP2Server().getPaoSet("hyworker",
+						P2Server.getP2Server().getSystemUserInfo());
+				PaoSetRemote tagents = P2Server.getP2Server().getPaoSet("tagents",
+						P2Server.getP2Server().getSystemUserInfo());
+				PaoSetRemote afterserviceorder = P2Server.getP2Server().getPaoSet("AFTERSERVICEORDER",
+						P2Server.getP2Server().getSystemUserInfo());
+				afterserviceorder.setWhere("SERVICENUM='" + getString("SERVERNUM") + "'");
+				tagents.setWhere("FAGENTNUM='" + getString("FAGENTNUM") + "'");
+				hyworker.setWhere("HYWORKERNUM ='" + getString("PROJECTLEADER") + "'");
+				hyworker.reset();
+				if (!hyworker.isEmpty() && getSite().equals("HY")) {
+					String submitby = afterserviceorder.getPao(0).getString("SUBMITBY");
+					String phone = hyworker.getPao(0).getString("WORKPHONE");
+					String fagentshortname = tagents.getPao(0).getString("FAGENTSHORTNAME");
+					HttpURLRest rest = new HttpURLRest("http://smssh1.253.com/msg/v1/send/json");
+					rest.addHeader("Content-type", "application/json");
+					org.json.JSONObject jsonObject = new org.json.JSONObject();
+					jsonObject.put("account", "N3147701");
+					jsonObject.put("password", "4ClGyab6fv6a87");
+					jsonObject.put("msg", "【Banninger】工单号：" + getString("FWORKNUM") + "已指派请处理，客户名称：" + fagentshortname
+							+ ",提交人：" + submitby + "，备注：" + getString("FNOTES"));
+					jsonObject.put("phone", phone);
+					rest.addRawBody(jsonObject.toString());
+					String s = rest.post();
+					PaoSetRemote verCodehistory = P2Server.getP2Server().getPaoSet("VerCodehistory",
+							P2Server.getP2Server().getSystemUserInfo());
+					PaoRemote remote = verCodehistory.addAtEnd();
+					remote.setValue("phone", phone);
+					remote.setValue("msg", "【Banninger】工单号：" + getString("FWORKNUM") + "已指派请处理，客户名称：" + fagentshortname
+							+ ",提交人：" + submitby + "，备注：" + getString("FNOTES"));
+					remote.setValue("content", s);
+					verCodehistory.save();
+				}
 			} catch (IOException e) {
-			    e.printStackTrace();
+				e.printStackTrace();
+			}
+		} else if (fieldname.equalsIgnoreCase("SCENEPHONE")) {
+			if (!StringUtils.isBlank(getString("SCENEPHONE"))) {
+				if (!Pattern.matches("^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$", getString("SCENEPHONE"))) {
+					throw new P2AppException("", "手机格式有误");
+				}
+				if (getSite().equals("TZ")) {
+					try {
+
+						HttpURLRest rest = new HttpURLRest("http://smssh1.253.com/msg/v1/send/json");
+						rest.addHeader("Content-type", "application/json");
+						org.json.JSONObject jsonObject = new org.json.JSONObject();
+						jsonObject.put("account", "N3147701");
+						jsonObject.put("password", "4ClGyab6fv6a87");
+						jsonObject.put("msg", "【Banninger】工单号：" + getString("FWORKNUM") + "已创建，请处理，工单查询链接：" + "1234");
+						jsonObject.put("phone", getString("SCENEPHONE"));
+						rest.addRawBody(jsonObject.toString());
+						String s = rest.post();
+						PaoSetRemote verCodehistory = P2Server.getP2Server().getPaoSet("VerCodehistory",
+								P2Server.getP2Server().getSystemUserInfo());
+						PaoRemote remote = verCodehistory.addAtEnd();
+						remote.setValue("phone", getString("SCENEPHONE"));
+						remote.setValue("msg", "【Banninger】工单号：" + getString("FWORKNUM") + "已创建，请处理，工单查询链接：" + "1234");
+						remote.setValue("content", s);
+						verCodehistory.save();
+					} catch (Exception e) {
+						// TODO: handle exception
+					}
+				}
 			}
+
 		}
 
 	}
@@ -288,16 +328,16 @@ public class hyworkorder extends PaoCust {
 				serviceformPao.setValue("fstatus", "已完成", 11l);
 			}
 		}
-		if(getSite().equals("TZ")) {
+		if (getSite().equals("TZ")) {
 			/** 给经销商发送消息 **/
-          PaoSetRemote paoSet = getPaoSet("$workermassage", "workermassage", "");
-          PaoRemote remote = paoSet.addAtEnd();
-          remote.setValue("ftype","经销商消息",11l);
-          remote.setValue("title","工单："+getString("fworknum")+"已经完成",11l);
-          remote.setValue("content","工单："+getString("fworknum")+"已经完成",11l);
-          remote.setValue("phone",getString("fagentnum"),11l);
+			PaoSetRemote paoSet = getPaoSet("$workermassage", "workermassage", "");
+			PaoRemote remote = paoSet.addAtEnd();
+			remote.setValue("ftype", "经销商消息", 11l);
+			remote.setValue("title", "工单：" + getString("fworknum") + "已经完成", 11l);
+			remote.setValue("content", "工单：" + getString("fworknum") + "已经完成", 11l);
+			remote.setValue("phone", getString("fagentnum"), 11l);
 		}
-		
+
 		setValue("Acceptancedate", new Date(), 11l);
 		PaoSetRemote paoSet1 = getPaoSet("$hyworker", "hyworker", "hyworkernum='" + hrid + "'");
 		if (!paoSet1.isEmpty()) {

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

@@ -260,7 +260,15 @@ public class Afterserviceorder extends Controller {
                     remote.setValue("ftext",afterserviceorder.getPao(0).getString("fnotes"),11l);
                     remote.setValue("ftype",where.getString("ftype"),2l);
                     remote.setValue("TEMPLATENUM",where.getString("fworknum"),2l);
-
+                    if(siteid.equals("TZ")) {
+                      	 /** 给经销商发送消息 **/
+                  		PaoSetRemote paoSet = remote.getPaoSet("$workermassage", "workermassage", "");
+                  		PaoRemote remote1 = paoSet.addAtEnd();
+                  		remote1.setValue("ftype", "经销商消息", 11l);
+                  		remote1.setValue("title", "服务申请单："+afterserviceorder.getString("Servicenum")+"已转成工单"+remote.getString("fworknum"), 11l);
+                  		remote1.setValue("content","服务申请单："+afterserviceorder.getString("Servicenum")+"已转成工单"+remote.getString("fworknum"), 11l);
+                  		remote1.setValue("phone", afterserviceorder.getPao(0).getString("FAGENTNUM"), 11l);
+                      }
                     String fsonum=afterserviceorder.getPao(0).getString("fsonum");
                     DBConnect connect = new DBConnect();
                     SQLFactory factory = null;

src/rest/openapi/restcontroller/hyworkorder/web/afterserviceorder/SQL/服务单关联工单.sql

@@ -2,4 +2,4 @@ select t1.fworknum,t1.ftype,t1.fstatus,CONVERT(varchar,t1.createdate,120)created
        t1.fcity,t1.fcounty,t1.faddress
 from Afterserviceorder t
 join hyWorkorder t1 on t.Servicenum=t1.servernum
-where t.servicenum=$servicenum$
+where t1.fstatus !='×÷·Ï' and t.servicenum=$servicenum$

src/rest/openapi/restcontroller/hyworkorder/webapp/hyconfirmationorder/SQL/售后服务确认单详情.sql

@@ -1,7 +1,7 @@
 select t.fbillnum,t.fstatus,t1.fisperiod,t1.repairprice,t1.scenefname,t1.scenephone,t2.appsystem,t2.errcategory,t.problemmsg,t.treatmentmeasures,t.siteid,
        CONVERT(varchar,t.nexthandledate,120)nexthandledate,t.itemdescription,t.result,t.result_msg,t.fnotes,CONVERT(varchar(16),t.nextreturndate,120)nextreturndate,t.reactionrate,t.cooperativeattitude,
        t.hyconfirmationorid ownerid,t2.afterserviceordeid,convert(varchar,t.createdate,120)createdate,case when t3.ftype='ÏîÄ¿¶©µ¥' then t4.FPROJECTNAME else t3.FPROJECTNOTES end fprojectname,
-       t1.faddress,t2.servicetype,t.famount,t.cooperativeattitude,t.fispaid,t.fisproduct,t.fisrepairedonline,t.fisreturnfactory,t.fisshelflife,t.fmaintenancecycle,t.fnotes2,t.fonsiteaccount,t.reactionrate,t5.fname,t6.displayname fsalername,t2.fagentnum
+       t1.faddress,t2.servicetype,t.famount,t.cooperativeattitude,t.fispaid,t.fisproduct,t.fisrepairedonline,t.fisreturnfactory,t.fisshelflife,t.fmaintenancecycle,t.fnotes2,t.fonsiteaccount,t.reactionrate,t5.fname,t6.displayname fsalername,t2.fagentnum,t3.fsonum
 from hyconfirmationorder t
          join hyWorkorder t1 on t.fparentid=t1.hyWorkorderid
          join Afterserviceorder t2 on t2.Servicenum=t1.servernum