砂站调度界面的车辆列表调整,区分发票和结算单
parent
fff8e4ea76
commit
a5a072b0bd
|
|
@ -119,11 +119,20 @@ public class TransportService extends BaseService {
|
|||
* @return
|
||||
*/
|
||||
public List<Record> inSupermarket(int supermarket_id) {
|
||||
String sql = " select t.*, t.id transport_id " +
|
||||
" from transport t \n" +
|
||||
" where t.state < ? \n" +
|
||||
" and t.supermarket_id = ? \n" +
|
||||
" order by t.out_time desc ";
|
||||
String sql = "SELECT\n" +
|
||||
" t.*, t.id transport_id,\n" +
|
||||
" r.req_receipt tp\n" +
|
||||
"FROM\n" +
|
||||
" `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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue