[CODE]: 协议添加合同编号字段

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

@@ -7,6 +7,7 @@
     <resultMap type="TWarehouseAgreement" id="TWarehouseAgreementResult">
         <result property="fId" column="f_id"/>
         <result property="fBillno" column="f_billno"/>
+        <result property="fContractno" column="f_contractno"/>
         <result property="fDeptid" column="f_deptid"/>
         <result property="fCorpid" column="f_corpid"/>
         <result property="fGoodsid" column="f_goodsid"/>
@@ -27,7 +28,7 @@
     </resultMap>
 
     <sql id="selectTWarehouseAgreementVo">
-        select f_id, f_billno, f_deptid, f_corpid, f_stltypeid, f_feetypeid, t_packages, f_trademodeid, f_freedays, f_begindate, f_enddate, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark from t_warehouse_agreement
+        select f_id, f_billno,f_contractno, f_deptid, f_corpid, f_stltypeid, f_feetypeid, t_packages, f_trademodeid, f_freedays, f_begindate, f_enddate, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark from t_warehouse_agreement
     </sql>
 
     <select id="selectTWarehouseAgreementList" parameterType="TWarehouseAgreement"
@@ -67,6 +68,7 @@
                 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="fContractno != null  and fContractno != ''">and agre.f_contractno = #{fContractno}</if>
             <if test="fDeptid != null ">and agre.f_deptid = #{fDeptid}</if>
             <if test="fCorpid != null ">and agre.f_corpid = #{fCorpid}</if>
             <if test="fGoodsid != null">and agre.f_goodsid = #{fGoodsid}</if>
@@ -91,6 +93,7 @@
         insert into t_warehouse_agreement
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="fBillno != null and fBillno != ''">f_billno,</if>
+            <if test="fContractno != null and fContractno != ''">f_contractno,</if>
             <if test="fDeptid != null">f_deptid,</if>
             <if test="fCorpid != null">f_corpid,</if>
             <if test="fGoodsid != null">f_goodsid,</if>
@@ -111,6 +114,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null and fBillno != ''">#{fBillno},</if>
+            <if test="fContractno != null and fContractno != ''">#{fContractno},</if>
             <if test="fDeptid != null">#{fDeptid},</if>
             <if test="fCorpid != null">#{fCorpid},</if>
             <if test="fGoodsid != null">#{fGoodsid},</if>
@@ -135,6 +139,7 @@
         update t_warehouse_agreement
         <trim prefix="SET" suffixOverrides=",">
             <if test="fBillno != null and fBillno != ''">f_billno = #{fBillno},</if>
+            <if test="fContractno != null and fContractno != ''">f_billno = #{fContractno},</if>
             <if test="fDeptid != null">f_deptid = #{fDeptid},</if>
             <if test="fCorpid != null">f_corpid = #{fCorpid},</if>
             <if test="fGoodsid != null">f_goodsid = #{fGoodsid},</if>