|
|
@@ -229,8 +229,9 @@ public class aftersalesmag extends Controller {
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","enterprisename");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid","agentnum");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_aftersalesmag_items", "t4", "t1.sa_aftersalesmagid = t4.sa_aftersalesmagid AND t1.siteid = t4.siteid","name","phonenumber","address",
|
|
|
- "stockdate","enddate","model","unitname","itemname","itemno","duty","demand","machinecode","reason","qty","itemid");
|
|
|
+ "stockdate","enddate","model","unitname","itemname","itemno","duty","demand","machinecode","qty","itemid");
|
|
|
querySQL.addQueryFields("remarksdetail","t4.remarks");
|
|
|
+ querySQL.addQueryFields("reasondetail","t4.reason");
|
|
|
querySQL.setSiteid(siteid);
|
|
|
querySQL.setWhere("t1.sa_aftersalesmagid",sa_aftersalesmagid);
|
|
|
querySQL.setPage(pageSize, pageNumber);
|
|
|
@@ -277,8 +278,9 @@ public class aftersalesmag extends Controller {
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","enterprisename");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid","agentnum");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_aftersalesmag_items", "t4", "t1.sa_aftersalesmagid = t4.sa_aftersalesmagid AND t1.siteid = t4.siteid","name","phonenumber","address",
|
|
|
- "stockdate","enddate","model","unitname","itemname","itemno","duty","demand","machinecode","reason","qty","itemid");
|
|
|
+ "stockdate","enddate","model","unitname","itemname","itemno","duty","demand","machinecode","qty","itemid");
|
|
|
querySQL.addQueryFields("remarksdetail","t4.remarks");
|
|
|
+ querySQL.addQueryFields("reasondetail","t4.reason");
|
|
|
querySQL.setSiteid(siteid);
|
|
|
querySQL.setWhere(where.toString());
|
|
|
querySQL.setWhere("t1.createflag=1 or t1.status !='新建'");
|