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

src/custom/restcontroller/sale/serviceorder/serviceorder.java

@@ -225,7 +225,7 @@ public class serviceorder extends Controller {
         if(rows.isEmpty()){
             return getErrReturnObject().setErrMsg("该服务申请单不存在").toString();
         }
-        if(!rows.get(0).getString("status").equals("待分配")){
+        if(!rows.get(0).getString("status").equals("待分配") && !rows.get(0).getString("status").equals("手工完结") ){
             return getErrReturnObject().setErrMsg("非待分配的服务申请单无法分配服务商").toString();
         }
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_serviceorder");

src/custom/restcontroller/webmanage/sale/salearea/salearea.java

@@ -373,6 +373,10 @@ public class salearea extends Controller {
                 where.append(" and ");
                 where.append("t1.status = '").append(whereObject.getString("status").equals("ACTIVE") ? "启用" : "禁用").append("' ");
             }
+            if (whereObject.containsKey("isservice") && !"".equals(whereObject.getString("isservice"))) {
+                where.append(" and ");
+                where.append("t1.isservice  = '").append(whereObject.getString("isservice")).append("' ");
+            }
         }
         boolean containssub = content.getBoolean("containssub");
         JSONArray sa_saleareaidsArray = content.getJSONArray("sa_saleareaids");

src/custom/restcontroller/webmanage/sale/serviceorder/SQL/服务申请单关联工单查询.sql

@@ -1,6 +1,7 @@
- select  t1.*,t2.province,t2.city,t2.county,t3.enterprisename,t3.entcode,t3.abbreviation,t4.agentnum from sa_workorder t1 
-                left join sa_serviceorder t2 on t1.sa_serviceorderid=t2.sa_serviceorderid and t1.siteid=t2.siteid 
-                left join  sys_enterprise t3 on t3.sys_enterpriseid=t2.sys_enterpriseid and t3.siteid=t2.siteid 
-                left join sa_agents t4 on t4.sys_enterpriseid=t3.sys_enterpriseid and t4.siteid=t3.siteid 
+ select  t1.*,t2.province,t2.city,t2.county,t3.enterprisename,t3.entcode,t3.abbreviation,t4.agentnum,t2.name,t2.phonenumber,t5.name teamname from sa_workorder t1
+                left join sa_serviceorder t2 on t1.sa_serviceorderid=t2.sa_serviceorderid and t1.siteid=t2.siteid
+                left join  sys_enterprise t3 on t3.sys_enterpriseid=t2.sys_enterpriseid and t3.siteid=t2.siteid
+                left join sa_agents t4 on t4.sys_enterpriseid=t3.sys_enterpriseid and t4.siteid=t3.siteid
+                left join sys_datateam t5 on t5.ownertable='sa_workorder' and t5.ownerid=t1.sa_workorderid and t1.siteid=t5.siteid
                 where t1.status !='作废'
                 and t1.sa_serviceorderid=$sa_serviceorderid$

src/custom/restcontroller/webmanage/sale/serviceorder/serviceorder.java

@@ -606,13 +606,6 @@ public class serviceorder extends Controller {
         		}
         	}
         	
-        	if(siteid.equalsIgnoreCase("TZ")) {
-        		if(StringUtils.isNotBlank(rows.get(0).getString("scenecontactphonenumber"))) {
-        			Sms sms =new Sms();
-        			sms.sendout(Sms.SmsType.Notice,siteid,rows.get(0).getString("scenecontactphonenumber"), "您好，您的服务申请单已处理，请点击链接前往查询https://oms.idcgroup.com.cn:8079/H5/index.html?id="+rows.get(0).getString("scenecontactphonenumber"));
-        		}
-        	}
-        	
         }
         return getSucReturnObject().setData(sa_workorderid).toString();
     }

src/custom/restcontroller/webmanage/sale/workorder/SQL/服务工单详情查询.sql

@@ -31,7 +31,10 @@ SELECT
     t11.model,
     t11.spec,
     t12.begdate cardbegdate,
-    t12.enddate cardenddate
+    t12.enddate cardenddate,
+    t14.agentnum agentnum_service,
+    t13.abbreviation abbreviation_service,
+    t13.enterprisename enterprisename_service
 FROM
 	sa_workorder t1
 	left join sa_serviceorder t2 on t1.sa_serviceorderid=t2.sa_serviceorderid and t1.siteid=t2.siteid
@@ -44,4 +47,7 @@ FROM
     left join (SELECT * FROM (SELECT *,ROW_NUMBER() OVER (PARTITION BY sa_serviceorderid ORDER BY sa_serviceorderitemsid ASC) AS rowno FROM sa_serviceorderitems) t WHERE rowno = 1) t10 on t10.sa_serviceorderid=t1.sa_serviceorderid and t10.siteid=t1.siteid
 	left join sa_warrantycard t12 on t10.cardno=t12.cardno
     left join plm_item t11 on t11.itemid=t10.itemid and t11.siteid=t10.siteid
+    left join sys_enterprise t13 on t13.sys_enterpriseid=t2.sys_enterpriseid_service and t13.siteid=t2.siteid
+    left join sa_agents t14 on t14.sys_enterpriseid=t2.sys_enterpriseid_service and t14.siteid=t2.siteid
+
 	where t1.siteid=$siteid$  and t1.sa_workorderid=$sa_workorderid$

src/custom/restcontroller/webmanage/sale/workorder/SQL/查询可添加配件列表.sql

@@ -41,7 +41,4 @@ WHERE t1.siteid = $siteid$
   and t1.isused = 1
   and t1.ismodule=1
   and $where$
-  and t1.itemid not in (SELECT t1.itemid
-                    from sa_workorder_node_items t1
-                    WHERE t1.siteid = $siteid$
-                      and t1.sa_workorderid = $sa_workorderid$)
+

src/custom/restcontroller/webmanage/sale/workorder/workorder.java

@@ -709,7 +709,7 @@ public class workorder extends Controller {
                     updateNodeStatussqlFactory.addParameter("finishdate", sdf.format(new Date()));
                     String fiscomplate = fiscomplate(sa_workorderid, sa_workorder_nodeid);
                     if (!fiscomplate.equals("true")) {
-                        return getErrReturnObject().setErrMsg(fiscomplate).toString();
+                        //return getErrReturnObject().setErrMsg(fiscomplate).toString();
                     }
 
                 } else {