箱号模糊查询

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseBills.java

@@ -592,6 +592,18 @@ public class TWarehouseBills extends BaseEntity {
     @Excel(name = "入库明细审批状态")
     private Long fItemstatus;
 
+    /**模糊查询箱号*/
+    @Excel(name = "箱号")
+    private String fCntrno;
+
+    public String getfCntrno() {
+        return fCntrno;
+    }
+
+    public void setfCntrno(String fCntrno) {
+        this.fCntrno = fCntrno;
+    }
+
     /**
      * 校验时间戳
      */

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

@@ -1668,8 +1668,8 @@
         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
         '下单新建'
         WHEN tw.f_billstatus = '2' and tw.f_updete_status = '2'and tw.f_submit_update = '2' and tw.f_delete_status = '2' THEN
@@ -1746,6 +1746,7 @@
         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 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
@@ -1767,8 +1768,8 @@
             tw.f_typeid = '1'
             and tw.del_flag = '0'
             <if test="fId != null">and tw.f_id = #{fId}</if>
-            <if test="fBillno != null  and fBillno != ''">and tw.f_billno like concat('%',
-                #{fBillno}, '%')</if>
+            <if test="fCntrno != null and fCntrno != ''">and items.f_cntrno like concat('%', #{fCntrno}, '%')</if>
+            <if test="fBillno != null  and fBillno != ''">and tw.f_billno like concat('%',#{fBillno}, '%')</if>
             <if test="fCustomsdeclartion != null  and fCustomsdeclartion != ''">and tw.f_customsdeclartion =
                 #{fCustomsdeclartion}
             </if>