|
@@ -153,13 +153,28 @@ public class LSALogistics extends Controller {
|
|
|
querySQL.setTableAlias("t1");
|
|
querySQL.setTableAlias("t1");
|
|
|
|
|
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "st_stockbill_items", "t2", "t2.st_stockbill_itemsid=t1.st_stockbill_itemsid and t2.siteid=t1.siteid",
|
|
querySQL.addJoinTable(JOINTYPE.left, "st_stockbill_items", "t2", "t2.st_stockbill_itemsid=t1.st_stockbill_itemsid and t2.siteid=t1.siteid",
|
|
|
- "rowno", "itemno", "itemname", "model", "unit", "price", "amount", "remarks");
|
|
|
|
|
|
|
+ "rowno","itemid", "itemno", "itemname", "model", "unit", "price", "amount", "remarks");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "st_stockbill", "t3", "t3.st_stockbillid =t2.st_stockbillid and t3.siteid=t2.siteid",
|
|
querySQL.addJoinTable(JOINTYPE.left, "st_stockbill", "t3", "t3.st_stockbillid =t2.st_stockbillid and t3.siteid=t2.siteid",
|
|
|
"billno");
|
|
"billno");
|
|
|
|
|
+ querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t4", "t4.itemid =t2.itemid and t4.siteid=t2.siteid",
|
|
|
|
|
+ "spec");
|
|
|
querySQL.setWhere("t1.sa_logisticsid=" + sa_logisticsid);
|
|
querySQL.setWhere("t1.sa_logisticsid=" + sa_logisticsid);
|
|
|
querySQL.setWhere("t1.siteid='" + siteid + "'");
|
|
querySQL.setWhere("t1.siteid='" + siteid + "'");
|
|
|
querySQL.setPage(pageSize, pageNumber).setOrderBy(pageSorting);
|
|
querySQL.setPage(pageSize, pageNumber).setOrderBy(pageSorting);
|
|
|
Rows rows = querySQL.query();
|
|
Rows rows = querySQL.query();
|
|
|
|
|
+
|
|
|
|
|
+ ArrayList<Long> ids = rows.toArrayList("itemid", new ArrayList<>());
|
|
|
|
|
+ // 封面cover
|
|
|
|
|
+ RowsMap coverRowsMap = getAttachmentUrl("plm_item", ids, "cover");
|
|
|
|
|
+ for (Row row : rows) {
|
|
|
|
|
+ Rows coverRows = coverRowsMap.get(row.getString("itemid"));
|
|
|
|
|
+ if (coverRows.isEmpty()) {
|
|
|
|
|
+ row.put("cover", "");
|
|
|
|
|
+ } else {
|
|
|
|
|
+ row.put("cover", coverRows.get(0).getString("url"));
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
return getSucReturnObject().setData(rows).toString();
|
|
return getSucReturnObject().setData(rows).toString();
|
|
|
}
|
|
}
|
|
|
|
|
|