|
|
@@ -157,11 +157,11 @@ public class LSALogistics extends Controller {
|
|
|
querySQL.setTableAlias("t1");
|
|
|
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "st_stockbill_items", "t2", "t2.st_stockbill_itemsid=t1.st_stockbill_itemsid and t2.siteid=t1.siteid",
|
|
|
- "rowno", "itemid", "itemno", "itemname", "model", "unit", "price", "amount", "remarks");
|
|
|
+ "rowno", "itemid", "unit", "price", "amount", "remarks");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "st_stockbill", "t3", "t3.st_stockbillid =t2.st_stockbillid and t3.siteid=t2.siteid",
|
|
|
"billno");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t4", "t4.itemid =t2.itemid and t4.siteid=t2.siteid",
|
|
|
- "spec");
|
|
|
+ "spec","itemno", "itemname", "model");
|
|
|
querySQL.setWhere("t1.sa_logisticsid=" + sa_logisticsid);
|
|
|
querySQL.setWhere("t1.siteid='" + siteid + "'");
|
|
|
querySQL.setPage(pageSize, pageNumber).setOrderBy(pageSorting);
|
|
|
@@ -199,10 +199,13 @@ public class LSALogistics extends Controller {
|
|
|
|
|
|
pageSorting = pageSorting.equals("''") ? "rowno" : pageSorting;
|
|
|
|
|
|
- QuerySQL querySQL = SQLFactory.createQuerySQL(this, "st_stockbill_items");
|
|
|
+ QuerySQL querySQL = SQLFactory.createQuerySQL(this, "st_stockbill_items",
|
|
|
+ "st_stockbill_itemsid","unit","qty","amount","remarks");
|
|
|
querySQL.setTableAlias("t1");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "st_stockbill", "t2", "t2.st_stockbillid =t1.st_stockbillid and t2.siteid=t1.siteid",
|
|
|
"billno");
|
|
|
+ querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t3", "t3.itemid =t1.itemid and t3.siteid=t1.siteid",
|
|
|
+ "spec","itemno", "itemname", "model");
|
|
|
querySQL.setWhere("t1.siteid='" + siteid + "'");
|
|
|
querySQL.setWhere("t2.sys_enterpriseid=" + sys_enterpriseid);
|
|
|
querySQL.setWhere("t2.status='审核'");
|