|
@@ -123,7 +123,8 @@
|
|
|
bill.f_qty AS fQty,
|
|
|
bill.f_grossweight AS fGrossweight,
|
|
|
bill.f_netweight AS fNetweight,
|
|
|
- bill.f_billstatus AS fBillstatus
|
|
|
+ bill.f_billstatus AS fBillstatus,
|
|
|
+ bill.f_items_status AS fItemsStatus
|
|
|
FROM
|
|
|
t_warehousebills bill
|
|
|
LEFT JOIN t_corps corp ON corp.f_id = bill.f_corpid
|
|
@@ -150,7 +151,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 like concat('%', #{fMarks}, '%') </if>
|
|
|
+ <if test="fMarks != null and fMarks != ''">and bill.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>
|
|
@@ -324,6 +325,7 @@
|
|
|
<if test="fBankcorpid != null">f_bankcorpid = #{fBankcorpid},</if>
|
|
|
<if test="fBilltype != null">f_billtype = #{fBilltype},</if>
|
|
|
<if test="fBillstatus != null">f_billstatus = #{fBillstatus},</if>
|
|
|
+ <if test="fItemsStatus != null">f_items_status = #{fItemsStatus},</if>
|
|
|
<if test="delFlag != null">del_flag = #{delFlag},</if>
|
|
|
<if test="createBy != null">create_by = #{createBy},</if>
|
|
|
<if test="createTime != null">create_time = #{createTime},</if>
|