完结工单生成保修卡地址取工单地址

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

@@ -1118,7 +1118,7 @@ public class workorder extends Controller {
         Long sa_workorderid = content.getLong("sa_workorderid");
 
         Rows rows = dbConnect
-                .runSqlQuery("select sa_serviceorderid,status,billno,type from sa_workorder where sa_workorderid ='"
+                .runSqlQuery("select sa_serviceorderid,status,billno,type,address from sa_workorder where sa_workorderid ='"
                         + sa_workorderid + "' and  siteid='" + siteid + "'");
         if (!rows.isEmpty()) {
             if (!rows.get(0).getString("status").equals("提交")) {
@@ -1238,7 +1238,7 @@ public class workorder extends Controller {
                 insertSQL.setValue("sa_customersid", sa_customersid);
                 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("address", rows.get(0).getString("address"));
                 insertSQL.setValue("province", itemrows.get(0).getString("province"));
                 insertSQL.setValue("city", itemrows.get(0).getString("city"));
                 insertSQL.setValue("county", itemrows.get(0).getString("county"));