砂站调度界面的车辆列表调整,区分发票和结算单

dev
wuwenxiong 2021-09-10 14:50:03 +08:00
parent fff8e4ea76
commit a5a072b0bd
1 changed files with 14 additions and 5 deletions

View File

@ -119,11 +119,20 @@ public class TransportService extends BaseService {
* @return * @return
*/ */
public List<Record> inSupermarket(int supermarket_id) { public List<Record> inSupermarket(int supermarket_id) {
String sql = " select t.*, t.id transport_id " + String sql = "SELECT\n" +
" from transport t \n" + " t.*, t.id transport_id,\n" +
" where t.state < ? \n" + " r.req_receipt tp\n" +
" and t.supermarket_id = ? \n" + "FROM\n" +
" order by t.out_time desc "; " `transport` t\n" +
"LEFT JOIN ordercluster_truck o ON t.truck_license = o.truck_license\n" +
"LEFT JOIN ordercluster r ON o.ordercluster_id = r.id\n" +
"WHERE\n" +
" t.state < ?\n" +
"AND t.supermarket_id = ?\n" +
"GROUP BY\n" +
" t.truck_license\n" +
"ORDER BY\n" +
" t.out_time DESC";
return Db.find(sql, OrderStateEnum.RECEIVED.getStateid(), supermarket_id); return Db.find(sql, OrderStateEnum.RECEIVED.getStateid(), supermarket_id);
} }