|
@@ -116,6 +116,7 @@
|
|
|
corpTo.f_name AS fTocorpid,
|
|
|
bill.f_mblno AS fMblno,
|
|
|
corpSub.f_name AS fSbu,
|
|
|
+ bill.f_marks AS fMarks,
|
|
|
bill.f_bsdate AS fBsdate,
|
|
|
bill.f_trademodeid AS fTrademodeid,
|
|
|
ware.f_name AS fWarehouseid,
|
|
@@ -132,7 +133,7 @@
|
|
|
LEFT JOIN t_warehousebillsitems item ON item.f_pid = bill.f_id
|
|
|
LEFT JOIN t_goods goods ON goods.f_id = item.f_goodsid
|
|
|
<where>
|
|
|
- <if test="fBillno != null and fBillno != ''">and bill.f_billno = #{fBillno}</if>
|
|
|
+ <if test="fBillno != null and fBillno != ''">and bill.f_billno like concat('%', #{fBillno}, '%')</if>
|
|
|
<if test="fCustomsdeclartion != null and fCustomsdeclartion != ''">and bill.f_customsdeclartion = #{fCustomsdeclartion}</if>
|
|
|
<if test="fOriginalbillno != null and fOriginalbillno != ''">and bill.f_originalbillno = #{fOriginalbillno}</if>
|
|
|
<if test="fDeptid != null ">and bill.f_deptid = #{fDeptid}</if>
|
|
@@ -149,7 +150,7 @@
|
|
|
<if test="fTel != null and fTel != ''">and bill.f_tel = #{fTel}</if>
|
|
|
<if test="fCorpid != null ">and bill.f_corpid = #{fCorpid}</if>
|
|
|
<if test="fTocorpid != null ">and bill.f_tocorpid = #{fTocorpid}</if>
|
|
|
- <if test="fMarks != null and fMarks != ''">and f_marks = #{fMarks}</if>
|
|
|
+ <if test="fMarks != null and fMarks != ''">and f_marks like concat('%', #{fMarks}, '%') </if>
|
|
|
<if test="fStltypeid != null ">and bill.f_stltypeid = #{fStltypeid}</if>
|
|
|
<if test="fBscorpno != null and fBscorpno != ''">and bill.f_bscorpno = #{fBscorpno}</if>
|
|
|
<if test="fWarehouseid != null ">and bill.f_warehouseid = #{fWarehouseid}</if>
|
|
@@ -167,7 +168,7 @@
|
|
|
<if test="fBillingway != null ">and bill.f_billingway = #{fBillingway}</if>
|
|
|
<if test="fSbu != null ">and bill.f_sbu = #{fSbu}</if>
|
|
|
<if test="fFeetunit != null and fFeetunit != ''">and bill.f_feetunit = #{fFeetunit}</if>
|
|
|
- <if test="fMblno != null and fMblno != ''">and bill.f_mblno = #{fMblno}</if>
|
|
|
+ <if test="fMblno != null and fMblno != ''">and bill.f_mblno like concat('%', #{fMblno}, '%') </if>
|
|
|
<if test="fVslvoy != null and fVslvoy != ''">and bill.f_vslvoy = #{fVslvoy}</if>
|
|
|
<if test="fEta != null ">and bill.f_eta = #{fEta}</if>
|
|
|
<if test="fCustomno != null and fCustomno != ''">and bill.f_customno = #{fCustomno}</if>
|