|
@@ -34,8 +34,10 @@
|
|
|
<include refid="selectTWarehouseAgreementVo"/>
|
|
|
<where>
|
|
|
<if test="fBillno != null and fBillno != ''">and f_billno = #{fBillno}</if>
|
|
|
+ <if test="fContractno != null and fContractno != ''">and f_contractno = #{fContractno}</if>
|
|
|
<if test="fDeptid != null ">and f_deptid = #{fDeptid}</if>
|
|
|
<if test="fCorpid != null ">and f_corpid = #{fCorpid}</if>
|
|
|
+ <if test="fGoodsid != null ">and f_goodsid = #{fGoodsid}</if>
|
|
|
<if test="fStltypeid != null ">and f_stltypeid = #{fStltypeid}</if>
|
|
|
<if test="fFeetypeid != null ">and f_feetypeid = #{fFeetypeid}</if>
|
|
|
<if test="tPackages != null and tPackages != ''">and t_packages = #{tPackages}</if>
|
|
@@ -47,6 +49,36 @@
|
|
|
</where>
|
|
|
</select>
|
|
|
|
|
|
+ <select id="selectTWarehouseAgreementList1" parameterType="TWarehouseAgreement"
|
|
|
+ resultMap="TWarehouseAgreementResult">
|
|
|
+ SELECT DISTINCT
|
|
|
+ agre.f_id AS fId,
|
|
|
+ corp.f_name AS fCorpid,
|
|
|
+ agre.f_contractno AS fContractno,
|
|
|
+ goods.f_name AS fGoodsid,
|
|
|
+ agre.f_begindate AS fBegindate,
|
|
|
+ agre.f_enddate AS fEnddate,
|
|
|
+ agre.f_feetypeid AS fFeetypeid,
|
|
|
+ agre.f_billstatus AS fBillstatus
|
|
|
+ FROM
|
|
|
+ t_warehouse_agreement agre
|
|
|
+ LEFT JOIN t_corps corp ON corp.f_id = agre.f_corpid
|
|
|
+ LEFT JOIN t_goods goods ON goods.f_id = agre.f_goodsid
|
|
|
+ <where>
|
|
|
+ <if test="fBillno != null and fBillno != ''">and agre.f_billno = #{fBillno}</if>
|
|
|
+ <if test="fDeptid != null ">and agre.f_deptid = #{fDeptid}</if>
|
|
|
+ <if test="fCorpid != null ">and agre.f_corpid = #{fCorpid}</if>
|
|
|
+ <if test="fStltypeid != null ">and agre.f_stltypeid = #{fStltypeid}</if>
|
|
|
+ <if test="fFeetypeid != null ">and agre.f_feetypeid = #{fFeetypeid}</if>
|
|
|
+ <if test="tPackages != null and tPackages != ''">and agre.t_packages = #{tPackages}</if>
|
|
|
+ <if test="fTrademodeid != null ">and agre.f_trademodeid = #{fTrademodeid}</if>
|
|
|
+ <if test="fFreedays != null ">and agre.f_freedays = #{fFreedays}</if>
|
|
|
+ <if test="fBegindate != null ">and agre.f_begindate = #{fBegindate}</if>
|
|
|
+ <if test="fEnddate != null ">and agre.f_enddate = #{fEnddate}</if>
|
|
|
+ <if test="fBillstatus != null and fBillstatus != ''">and agre.f_billstatus = #{fBillstatus}</if>
|
|
|
+ </where>
|
|
|
+ </select>
|
|
|
+
|
|
|
<select id="selectTWarehouseAgreementById" parameterType="Long" resultMap="TWarehouseAgreementResult">
|
|
|
<include refid="selectTWarehouseAgreementVo"/>
|
|
|
where f_id = #{fId}
|