保修卡生成逻辑优化

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

@@ -1063,12 +1063,13 @@ 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,t3.name,t3.phonenumber,t3.province,t3.city,t3.county,t3.address,t1.sku,ifnull(t2.warrantyday,0) warrantyday,t4.sa_agentsid,t3.sys_enterpriseid,t6.sa_agentsid sa_agentsid_to,t6.agentnum toagentnum from sa_serviceorderitems t1 " +
+            Rows itemrows = dbConnect.runSqlQuery("select t1.sku,t3.sa_customersid,t5.sa_agentsid customeragentsid,t3.name,t3.phonenumber,t3.province,t3.city,t3.county,t3.address,t1.sku,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 " +
                     " inner join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid " +
                     " left join sa_serviceorder t3 on t1.sa_serviceorderid=t3.sa_serviceorderid and t1.siteid=t3.siteid " +
                     " left join sa_agents t4 on t3.sys_enterpriseid=t4.sys_enterpriseid and t3.siteid=t4.siteid " +
                     " left join sa_customers t5 on t5.sa_customersid=t3.sa_customersid and t5.siteid=t3.siteid " +
                     " left join sa_agents t6 on t3.sys_enterpriseid_service=t6.sys_enterpriseid and t3.siteid=t6.siteid " +
+                    " left join sa_itemsku t7 on t7.sku=t1.sku and t7.siteid=t1.siteid " +
                     "where t1.sa_serviceorderid=" + rows.get(0).getLong("sa_serviceorderid") + " and t1.siteid='" + siteid + "' ");
 
             if (itemrows.isNotEmpty()) {
@@ -1102,6 +1103,7 @@ public class workorder extends Controller {
                     insertSQL.setValue("county", itemrows.get(0).getString("county"));
                     insertSQL.setValue("address", itemrows.get(0).getString("address"));
                     insertSQL.setValue("sa_customersid", sa_customersid);
+                    insertSQL.setValue("itemid", itemrows.get(0).getLong("itemid"));
                     sqlList.add(insertSQL.getSQL());
                 }
 
@@ -1124,8 +1126,13 @@ 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("address", itemrows.get(0).getString("address"));
                 insertSQL.setValue("enddate", formattedDate);
                 insertSQL.setValue("begdate", getDateTime_Str());
+                insertSQL.setValue("itemid",  itemrows.get(0).getLong("itemid"));
+
                 sqlList.add(insertSQL.getSQL());
             }