|
|
@@ -2596,12 +2596,12 @@
|
|
|
</update>
|
|
|
<!--凯和单航次配船-->
|
|
|
<select id="singleVoyageByShip" parameterType="TWarehousebills" resultType="com.ruoyi.shipping.excel.SingleVoyageByShipExcel">
|
|
|
- SELECT
|
|
|
+ SELECT
|
|
|
tv.f_name vslName,
|
|
|
ty.f_no voyNo,
|
|
|
- ty.f_ATD fAtd,
|
|
|
- ty.f_ATA fAta,
|
|
|
- ta.f_name fName,
|
|
|
+ ty.f_ATD fAtd,
|
|
|
+ ty.f_ATA fAta,
|
|
|
+ ta.f_name fName,
|
|
|
tre.f_name loadportName,
|
|
|
ts.f_name destportName,
|
|
|
tw.f_vslid fVslid,
|
|
|
@@ -2609,13 +2609,13 @@
|
|
|
tw.f_arrival_status fArrivalStatus
|
|
|
FROM
|
|
|
t_warehousebills tw
|
|
|
- LEFT JOIN t_address ta ON ta.f_id = tw.f_laneid
|
|
|
- LEFT JOIN t_address tre ON tre.f_id = tw.f_loadportid
|
|
|
- LEFT JOIN t_address ts ON ts.f_id = tw.f_destportid
|
|
|
LEFT JOIN sys_dict_data sd ON sd.dict_value = tw.f_serviceitems
|
|
|
AND sd.dict_type = 'f_serviceitems'
|
|
|
LEFT JOIN t_vessel tv ON tw.f_vslid = tv.f_id
|
|
|
LEFT JOIN t_voyage ty ON tw.f_voyid = ty.f_id
|
|
|
+ LEFT JOIN t_address ta ON ta.f_id = ty.f_laneid
|
|
|
+ LEFT JOIN t_address tre ON tre.f_id = ty.f_portofloadid
|
|
|
+ LEFT JOIN t_address ts ON ts.f_id = ty.f_distinationid
|
|
|
LEFT JOIN t_corps tp ON tw.f_corpid = tp.f_id
|
|
|
LEFT JOIN (
|
|
|
SELECT
|
|
|
@@ -2631,10 +2631,10 @@
|
|
|
) tc ON tc.f_pid = tw.f_id
|
|
|
LEFT JOIN (SELECT f_pid,f_billstatus FROM t_warehousebillsfees GROUP BY f_pid,f_billstatus)tf ON tf.f_pid = tw.f_id
|
|
|
where
|
|
|
- tw.f_typeid = '1'
|
|
|
- and tw.del_flag = '0'
|
|
|
- and tw.f_cargo_planning = '0'
|
|
|
- and tw.f_arrival_status != '2'
|
|
|
+ tw.f_typeid = '1'
|
|
|
+ and tw.del_flag = '0'
|
|
|
+ and tw.f_cargo_planning = '0'
|
|
|
+ and tw.f_arrival_status != '2'
|
|
|
<if test="fVslid != null ">and tw.f_vslid = #{fVslid}</if>
|
|
|
<if test="fVoyid != null ">and tw.f_voyid = #{fVoyid}</if>
|
|
|
GROUP BY tw.f_vslid,tw.f_voyid
|
lazhaoqian