模糊查询箱号sql错误修改

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -1668,7 +1668,6 @@
         tw.f_destportid fDestportid,
         ts.f_name  destportName,
         tc.f_name goodsName,
-        items.f_cntrno,
         CASE
         WHEN tw.f_billstatus = '1' and tw.f_updete_status = '2'and tw.f_submit_update = '2' and tw.f_delete_status = '2' THEN
         '下单新建'
@@ -1745,9 +1744,9 @@
         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
+        LEFT JOIN sys_dict_data sd ON sd.dict_value = tw.f_serviceitems AND sd.dict_type = 'f_serviceitems'
         LEFT JOIN t_warehousebills_cntritems items ON tw.f_id = items.f_pid
-        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_corps tp ON tw.f_corpid = tp.f_id