服务确认单详情添加经销商名称

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

@@ -5,9 +5,9 @@ select t.servicenum,convert(varchar,t.createdate,120)createdate,t.fsonum,t.fnote
        t.faddress,
        t.backreason,
        t.servicetype,
-       t2.fstatus fworkstatus,
+       case when t2.fstatus is null then '帤諉等' when t2.fstatus in('渾羲宎','渾諉等') then '帤諉等' when t2.fstatus in('輛俴笢','婃礿','眒俇傖') then '眒諉等' end fworkstatus,
        convert(varchar,t.servicebegindate,120)servicebegindate,
        convert(varchar,t.serviceenddate,120)serviceenddate
        from Afterserviceorder t
-       left join hyworkorder t2 on t.servicenum=t2.servernum
+       left join (select * from hyworkorder where fstatus !='釬煙') t2 on t.servicenum=t2.servernum
 where t.siteid=$siteid$ and $where$

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,t3.fsonum
+       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,t7.fagentshortname,t7.fagentname,t3.fsonum
 from hyconfirmationorder t
          join hyWorkorder t1 on t.fparentid=t1.hyWorkorderid
          join Afterserviceorder t2 on t2.Servicenum=t1.servernum
@@ -9,4 +9,5 @@ from hyconfirmationorder t
          left join TPROJECT t4 on t4.fprojectnum=t3.fprojectnum
          left join hyworker t5 on t5.hyworkernum=t1.projectleader 
          left join pp_hr t6 on t6.hrid=t3.fsaler and t6.siteid=t3.siteid  
+         left join tagents t7 on t7.fagentnum=t2.fagentnum and t7.siteid=t2.siteid  
 where t.fbillnum=$fbillnum$