服务预约单，服务工单添加客户id

src/custom/restcontroller/R.java

@@ -6646,6 +6646,11 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2025082210142103 {
+        public static class v1 {
+        }
+    }
 }
 
 

src/custom/restcontroller/webmanage/sale/serviceorder/SQL/服务申请单新增.sql

@@ -1,4 +1,4 @@
 insert into sa_serviceorder (siteid, sa_serviceorderid,createuserid,createby, createdate, billno,billdate,changeuserid,changeby, changedate,
-                                sys_enterpriseid,sa_orderid,reason,remarks,servicetype,class1,class2,province,city,county,address,scenecontact,scenecontactrole,scenecontactphonenumber,begdate,enddate, status,saler_hrid,name,phonenumber)
+                                sys_enterpriseid,sa_orderid,reason,remarks,servicetype,class1,class2,province,city,county,address,scenecontact,scenecontactrole,scenecontactphonenumber,begdate,enddate, status,saler_hrid,name,phonenumber,sa_customersid)
 values ($siteid$, $sa_serviceorderid$,$userid$,$username$, CURRENT_TIME, $billno$,$billdate$,$userid$, $username$, CURRENT_TIME, $sys_enterpriseid$,$sa_orderid$,$reason$,$remarks$,$servicetype$,$class1$,$class2$,
-        $province$,$city$,$county$,$address$,$scenecontact$,$scenecontactrole$,$scenecontactphonenumber$,$begdate$,$enddate$,'新建',$saler_hrid$,$name$,$phonenumber$);
+        $province$,$city$,$county$,$address$,$scenecontact$,$scenecontactrole$,$scenecontactphonenumber$,$begdate$,$enddate$,'新建',$saler_hrid$,$name$,$phonenumber$,$sa_customersid$);

src/custom/restcontroller/webmanage/sale/serviceorder/SQL/服务申请单更新.sql

@@ -21,7 +21,8 @@ SET
     enddate=$enddate$,
     saler_hrid=$saler_hrid$,
     name=$name$,
-    phonenumber=$phonenumber$
+    phonenumber=$phonenumber$,
+    sa_customersid=$sa_customersid$
 WHERE sa_serviceorderid = $sa_serviceorderid$ and siteid=$siteid$
 
 

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

@@ -65,6 +65,7 @@ public class serviceorder extends Controller {
         String begdate = content.getStringValue("begdate");
         String enddate = content.getStringValue("enddate");
         long saler_hrid = content.getLongValue("saler_hrid");
+        long sa_customersid = content.getLongValue("sa_customersid");
 
         String sku= content.getStringValue("sku");
         String cardno= content.getStringValue("cardno");
@@ -147,6 +148,8 @@ public class serviceorder extends Controller {
 
         sqlFactory.addParameter("name", content.getStringValue("name"));
         sqlFactory.addParameter("phonenumber", content.getStringValue("phonenumber"));
+        sqlFactory.addParameter("sa_customersid", content.getStringValue("sa_customersid"));
+
         sqlList.add(sqlFactory.getSQL());
 
         InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "sa_serviceorderitems");
@@ -189,6 +192,60 @@ public class serviceorder extends Controller {
     }
 
 
+
+    @API(title = "可选择序列号列表查询", apiversion = R.ID2025082210142103.v1.class)
+    @CACHEING
+    public String queryskuList() throws YosException {
+
+        if (content.containsKey("sys_enterpriseid")) {
+            sys_enterpriseid = content.getLong("sys_enterpriseid");
+        }
+
+
+
+        /*
+         * 过滤条件设置
+         */
+        StringBuffer where = new StringBuffer(" 1=1 ");
+
+        if (content.containsKey("where")) {
+            JSONObject whereObject = content.getJSONObject("where");
+            if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
+                where.append(" and(");
+                where.append("t2.itemname like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t2.itemno like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.sku like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append(")");
+            }
+        }
+//		String hrid = content.getString("hrid");
+//        SQLFactory sqlFactory = new SQLFactory(this, "审核订单列表查询", pageSize, pageNumber, pageSorting);
+//        sqlFactory.addParameter_SQL("where", where);
+//        sqlFactory.addParameter("siteid", siteid);
+//        sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
+//        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL(false));
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_itemsku ", "sku");
+        querySQL.setTableAlias("t1");
+        querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemid=t2.itemid and t1.siteid=t2.siteid","itemid","itemno","itemname","model","spec");
+        querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t3", "t3.unitid=t2.unitid and t3.siteid=t2.siteid","unitname");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.sa_agentsid=t1.sa_agentsid and t4.siteid=t1.siteid","agentnum");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid and t5.siteid=t4.siteid","contact","phonenumber","address");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t6", "t6.sku=t1.sku and t6.siteid=t1.siteid","cardno","begdate","enddate");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t7", "t6.sa_customersid=t7.sa_customersid and t6.siteid=t7.siteid","sa_customersid");
+        querySQL.addQueryFields("customername","t7.name");
+        querySQL.addQueryFields("customerphonenumber","t7.phonenumber");
+
+        querySQL.setSiteid(siteid);
+        querySQL.setWhere("t1.sa_agentsid in (select sa_agentsid from sa_agents where  sys_enterpriseid="+sys_enterpriseid+")");
+        querySQL.setWhere(where.toString());
+        querySQL.setDistinct(true);
+        querySQL.setPage(pageSize, pageNumber);
+        querySQL.setOrderBy(pageSorting);
+        Rows rows = querySQL.query();
+
+        return getSucReturnObject().setData(rows).toString();
+    }
+
     @API(title = "可选择订单列表查询", apiversion = R.ID20230206091503.v1.class)
     @CACHEING
     public String queryCheckOrderList() throws YosException {

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

@@ -4,6 +4,7 @@ select  t1.*,
         t2.class2,
         t2.name customername,
         t2.phonenumber customerphonenumber,
+        t2.sa_customersid,
         t4.name templatename,
         t6.agentnum,
         t5.abbreviation,

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

@@ -5,6 +5,7 @@ SELECT
     t2.class2,
     t2.name customername,
     t2.phonenumber customerphonenumber,
+    t2.sa_customersid,
     t4.name templatename,
     t6.agentnum,
     t5.abbreviation,

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

@@ -73,6 +73,10 @@ public class workorder extends Controller {
         String servicetype = content.getStringValue("servicetype");
         String cardno = content.getStringValue("cardno");
         String sku = content.getStringValue("sku");
+        String name = content.getStringValue("name");
+        String phonenumber = content.getStringValue("phonenumber");
+        long sa_customersid = content.getLongValue("sa_customersid");
+
         long itemid = content.getLongValue("itemid");
 
 
@@ -132,6 +136,9 @@ public class workorder extends Controller {
         updateSQL.setValue("city", city);
         updateSQL.setValue("county", county);
         updateSQL.setValue("servicetype", servicetype);
+        updateSQL.setValue("name", name);
+        updateSQL.setValue("phonenumber", phonenumber);
+        updateSQL.setValue("sa_customersid", sa_customersid);
 
         sqlList.add(updateSQL.getSQL());
 
@@ -1028,7 +1035,6 @@ public class workorder extends Controller {
     }
 
 
-    @API(title = "查询客户序列号", apiversion = R.ID2025080813465203.v1.class)
     @CACHEING
     public String queryCustomerSkuList() throws YosException {
 
@@ -1062,7 +1068,9 @@ public class workorder extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.sa_agentsid=t1.sa_agentsid and t4.siteid=t1.siteid","agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid and t5.siteid=t4.siteid","enterprisename");
         querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t6", "t6.sku=t1.sku and t6.siteid=t1.siteid","cardno","begdate","enddate","name","phonenumber");
-
+        querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t7", "t6.sa_customersid=t7.sa_customersid and t6.siteid=t7.siteid","sa_customersid");
+        querySQL.addQueryFields("customername","t7.name");
+        querySQL.addQueryFields("customerphonenumber","t7.phonenumber");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where.toString());
         querySQL.setDistinct(true);