|
|
@@ -61,7 +61,8 @@
|
|
|
truck.truck_id as truckId, truck.tms_status as tmsStatus, truck.org_id as orgId, truck.org_name as orgName, truck.org_short_name as orgShortName,
|
|
|
truck.car_number as carNumber, truck.trailer_number as trailerNumber, truck.dept_id as deptId, truck.dept_name as deptName,
|
|
|
two.id as orderId, two.order_status as orderStatus, two.order_no as orderNo, two.type, two.spot_id as spotId, two.spot_name as spotName,
|
|
|
- two.update_date as updateDate, two.create_date as createDate, two.queue_no as queueNo
|
|
|
+ two.update_date as updateDate, two.create_date as createDate, two.queue_no as queueNo,
|
|
|
+ case when wc.jing_weight > 0 then 1 else 0 end as weightFlag
|
|
|
FROM
|
|
|
truck
|
|
|
left join (
|
|
|
@@ -95,6 +96,7 @@
|
|
|
</if>
|
|
|
order by order_status desc, plan_reach_time asc
|
|
|
) two on truck.truck_id = two.truck_id
|
|
|
+ left join tms_work_cycle wc on truck.truck_id = wc.truck_id and wc.status = 1
|
|
|
<where>
|
|
|
<if test="param!=null and param.orgId!=null">
|
|
|
and truck.org_id = #{param.orgId}
|