工单完结逻辑优化

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

@@ -1063,7 +1063,7 @@ public class workorder extends Controller {
         }
 
         if (rows.get(0).getString("type").equals("安装")) {
-            Rows itemrows = dbConnect.runSqlQuery("select t1.sku,t3.sa_customersid,t5.sa_agentsid customeragentsid,case when t3.sa_customersid!=0 then t5.name else t3.name end name,case when t3.sa_customersid!=0 then t5.phonenumber else t3.phonenumber end phonenumber,t3.province,t3.city,t3.county, case when t3.sa_customersid!=0 then t5.address else t3.address end address,ifnull(t2.warrantyday,0) warrantyday,t4.sa_agentsid,t3.sys_enterpriseid,t6.sa_agentsid sa_agentsid_to,t6.agentnum toagentnum,t7.itemid from sa_serviceorderitems t1  \n" +
+            Rows itemrows = dbConnect.runSqlQuery("select t1.sku,t3.scenecontact,t3.scenecontactphonenumber,t3.sa_customersid,t5.sa_agentsid customeragentsid,case when t3.sa_customersid!=0 then t5.name else t3.name end name,case when t3.sa_customersid!=0 then t5.phonenumber else t3.phonenumber end phonenumber,t3.province,t3.city,t3.county, case when t3.sa_customersid!=0 then t5.address else t3.address end address,ifnull(t2.warrantyday,0) warrantyday,t4.sa_agentsid,t3.sys_enterpriseid,t6.sa_agentsid sa_agentsid_to,t6.agentnum toagentnum,t7.itemid from sa_serviceorderitems t1  \n" +
                     "                     inner join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  \n" +
                     "                     left join sa_serviceorder t3 on t1.sa_serviceorderid=t3.sa_serviceorderid and t1.siteid=t3.siteid  \n" +
                     "                     left join sa_agents t4 on t3.sys_enterpriseid=t4.sys_enterpriseid and t3.siteid=t4.siteid  \n" +
@@ -1131,8 +1131,8 @@ public class workorder extends Controller {
                 insertSQL.setValue("sku", itemrows.get(0).getString("sku"));
                 insertSQL.setValue("cardno", createBillCode("warrantycard"));
                 insertSQL.setValue("sa_customersid", sa_customersid);
-                insertSQL.setValue("name", itemrows.get(0).getString("name"));
-                insertSQL.setValue("phonenumber", itemrows.get(0).getString("phonenumber"));
+                insertSQL.setValue("name", itemrows.get(0).getString("scenecontact"));
+                insertSQL.setValue("phonenumber", itemrows.get(0).getString("scenecontactphonenumber"));
                 insertSQL.setValue("address", itemrows.get(0).getString("address"));
                 insertSQL.setValue("enddate", formattedDate);
                 insertSQL.setValue("begdate", getDateTime_Str());