|
@@ -760,7 +760,8 @@
|
|
|
dh.goods_type_count,
|
|
|
dh.oper_time,
|
|
|
s.supplier AS supplier_name,
|
|
|
- dh.status
|
|
|
+ dh.status,
|
|
|
+ dh.receiver_address
|
|
|
FROM
|
|
|
jsh_depot_head dh
|
|
|
LEFT JOIN jsh_supplier s ON dh.organ_id = s.id
|
|
@@ -777,6 +778,9 @@
|
|
|
<if test="beginTime != null and beginTime != ''">
|
|
|
AND dh.create_time between #{beginTime} and #{endTime}
|
|
|
</if>
|
|
|
+ <if test="depotId != null and depotId !=0">
|
|
|
+ AND dh.depot_id = #{depotId}
|
|
|
+ </if>
|
|
|
</where>
|
|
|
GROUP BY dh.id
|
|
|
ORDER BY dh.create_time DESC
|