bug修复

src/custom/restcontroller/R.java

@@ -6980,6 +6980,10 @@ public class R {
         public static class v1 {
         }
     }
+    public static class ID2025121818251203 {
+        public static class v1 {
+        }
+    }
 }
 
 

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商修改.sql

@@ -18,6 +18,7 @@ set changeuserid=$changeuserid$,
     salearea=$salearea$,
     paymans=$paymans$,
     regiontype=$regiontype$,
-    u8subject=$u8subject$
+    u8subject=$u8subject$,
+    recommendedservice=$recommendedservice$
 where siteid = $siteid$
   and sa_agentsid = $sa_agentsid$

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商列表查询.sql

@@ -7,6 +7,7 @@ select t1.sys_enterpriseid,
        t2.city,
        t2.county,
        t2.u8subject,
+       t2.recommendedservice,
        t1.isservice,
        t1.sa_agentsid,
        t1.submitautocheck,

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商新增.sql

@@ -1,7 +1,7 @@
 insert into sa_agents(siteid, sa_agentsid, sys_enterpriseid, createby, createdate, changeuserid,
                       changeby, changedate, agentnum, type, parentid,
                       signdate, status, isservice,priceadjustment,entity,submitautocheck,presalesphonenumber,aftersalesphonenumber
-    ,islimitaccessories,islimitorder,signingstate,delivery,salearea,paymans,regiontype,u8subject)
+    ,islimitaccessories,islimitorder,signingstate,delivery,salearea,paymans,regiontype,u8subject,recommendedservice)
 select $siteid$,
        $sa_agentsid$,
        $sys_enterpriseid$,
@@ -28,4 +28,5 @@ select $siteid$,
        $salearea$,
        $paymans$,
        $regiontype$,
-       $u8subject$
+       $u8subject$,
+       $recommendedservice$

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商详情查询.sql

@@ -18,6 +18,7 @@ select t1.sys_enterpriseid,
        t1.taxno,
        t1.saleclassauth,
        t2.u8subject,
+       t2.recommendedservice,
        t2.signdate,
        t2.createby,
        t2.createdate,

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

@@ -140,6 +140,7 @@ public class agents extends Controller {
         String paymans = content.getStringValue("paymans");
         String regiontype = content.getStringValue("regiontype");
         String u8subject = content.getStringValue("u8subject");
+        String recommendedservice = content.getStringValue("recommendedservice");
 
 
         if (parentid != 0 && dbConnect.runSqlQuery("select * from sa_agents where siteid='" + siteid + "' and sa_agentsid=" + parentid).isEmpty()) {
@@ -196,6 +197,7 @@ public class agents extends Controller {
         sqlFactory.addParameter("paymans",paymans);
         sqlFactory.addParameter("regiontype",regiontype);
         sqlFactory.addParameter("u8subject",u8subject);
+        sqlFactory.addParameter("recommendedservice",recommendedservice);
 
 
         sqllist.add(sqlFactory.getSQL());

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

@@ -127,13 +127,13 @@ public class serviceorder extends Controller {
                     "SELECT status,sys_enterpriseid,sa_orderid from sa_serviceorder WHERE sa_serviceorderid = "
                             + sa_serviceorderid);
             if (rows.isNotEmpty()) {
-                if (rows.get(0).getString("status").equals("新建")) {
+                if (rows.get(0).getString("status").equals("新建") || rows.get(0).getString("status").equals("待分配")) {
                     sqlFactory = new SQLFactory(this, "服务申请单更新");
                     sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
                     sqlList.add(DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "更新", "服务申请单更新成功")
                             .getSQL());
                 } else {
-                    return getErrReturnObject().setErrMsg("非新建状态下无法编辑").toString();
+                    return getErrReturnObject().setErrMsg("该状态下无法编辑").toString();
                 }
 
             } else {
@@ -890,6 +890,31 @@ public class serviceorder extends Controller {
         return getSucReturnObject().toString();
     }
 
+    @API(title = "撤回分配服务申请单", apiversion = R.ID2025121818251203.v1.class)
+    @CACHEING_CLEAN(apiClass = {workorder.class, serviceorder.class, warrantycard.class})
+    public String chehuiServiceOrder() throws YosException {
+        long sa_serviceorderid = content.getLong("sa_serviceorderid");
+        ArrayList<String> sqllist = new ArrayList<>();
+
+        Rows serviceorderRows = dbConnect.runSqlQuery("select status,billno from sa_serviceorder where sa_serviceorderid ='"
+                + sa_serviceorderid + "' and  siteid='" + siteid + "'");
+        if(serviceorderRows.isNotEmpty()){
+            if(!serviceorderRows.get(0).getString("status").equals("待受理")){
+                return getErrReturnObject().setErrMsg("非待受理状态的服务申请单无法撤回分配").toString();
+            }
+            sqllist.add("update sa_serviceorder set sys_enterpriseid_service=0,status='待分配',allocationdate=null,allocationby='' where sa_serviceorderid="+sa_serviceorderid);
+            sqllist.add(DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "撤回分配", "服务申请单撤回分配成功")
+                    .getSQL());
+        }else{
+            return getErrReturnObject().setErrMsg("服务申请单不存在").toString();
+        }
+
+        dbConnect.runSqlUpdate(sqllist);
+
+        return getSucReturnObject().toString();
+    }
+
+
 
     @API(title = "发送手机验证码", apiversion = R.ID20230215173103.v1.class, accesstoken = false)
     public String sendMessage() throws YosException {