返修单可选择商品列表添加保修卡信息

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

@@ -181,6 +181,7 @@ public class aftersalesmag extends Controller {
         }
 
 
+
         /*
          * 过滤条件设置
          */
@@ -208,6 +209,8 @@ public class aftersalesmag extends Controller {
         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");
         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.setSiteid(siteid);
         querySQL.setWhere("t1.sa_agentsid in (select sa_agentsid from sa_agents where  sys_enterpriseid="+sys_enterpriseid+")");
         querySQL.setWhere("t1.sku not in (select distinct machinecode from sa_aftersalesmag_items where siteid='"+siteid+"' and ifnull(machinecode,'')!='')");