添加明细查询 字段

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

@@ -41,7 +41,6 @@
         <result property="remark" column="remark"/>
         <result property="fMarks" column="f_marks"/>
         <result property="fInventoryDays" column="f_inventory_days"/>
-        <result property="fStorageFeeDeadline" column="f_storage_fee_deadline"/>
         <result property="fAmt" column="f_amt"/>
         <result property="fBillingDays" column="f_billing_days"/>
         <result property="fDriverName" column="f_driver_name"/>
@@ -55,7 +54,7 @@
     </resultMap>
 
     <sql id="selectTWarehousebillsitemsVo">
-        select f_id, f_pid, f_lineno, f_goodsid, f_billno, f_mblno, f_warehouselocid, f_originalbillno, f_bsdate, f_boxno, f_cntqty, f_goodsval, f_cntrtype, f_planqty, f_billingway, f_planvolumn, f_originalbilldate, f_packagespecs, f_plangrossweight, f_chargedate, f_plannetweight, f_qty, f_volumn, f_grossweight, f_netweight, f_cntrno, f_truckno, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark, f_marks, f_inventory_days, f_storage_fee_deadline, f_amt, f_billing_days, f_driver_name, f_driver_tel, f_driver_id_car, f_serial_number, f_is_pass, f_billtype, f_billing_qty, f_billing_deadline from t_warehousebillsitems
+        select f_id, f_pid, f_lineno, f_goodsid, f_billno, f_mblno, f_warehouselocid, f_originalbillno, f_bsdate, f_boxno, f_cntqty, f_goodsval, f_cntrtype, f_planqty, f_billingway, f_planvolumn, f_originalbilldate, f_packagespecs, f_plangrossweight, f_chargedate, f_plannetweight, f_qty, f_volumn, f_grossweight, f_netweight, f_cntrno, f_truckno, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark, f_marks, f_inventory_days, f_amt, f_billing_days, f_driver_name, f_driver_tel, f_driver_id_car, f_serial_number, f_is_pass, f_billtype, f_billing_qty, f_billing_deadline from t_warehousebillsitems
     </sql>
 
     <select id="selectTWarehousebillsitemsList" parameterType="TWarehousebillsitems"
@@ -90,7 +89,6 @@
             <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
             <if test="fMarks != null  and fMarks != ''">and f_marks = #{fMarks}</if>
             <if test="fInventoryDays != null ">and f_inventory_days = #{fInventoryDays}</if>
-            <if test="fStorageFeeDeadline != null ">and f_storage_fee_deadline = #{fStorageFeeDeadline}</if>
             <if test="fAmt != null ">and f_amt = #{fAmt}</if>
             <if test="fBillingDays != null ">and f_billing_days = #{fBillingDays}</if>
             <if test="fDriverName != null  and fDriverName != ''">and f_driver_name like concat('%',
@@ -130,6 +128,11 @@
             item.f_plannetweight AS fPlannetweight,
             item.f_qty AS fQty,
             item.f_volumn AS fVolumn,
+            item.f_driver_name AS fDriverName,
+            item.f_driver_tel AS fDriverTel,
+            item.f_driver_id_car AS fDriverIdCar,
+            item.f_serial_number AS fSerialNumber,
+            item.f_marks AS fMarks,
             item.f_grossweight AS fGrossweight,
             item.f_netweight AS fNetweight,
             item.f_cntrno AS fCntrno,
@@ -189,7 +192,6 @@
             <if test="remark != null">remark,</if>
             <if test="fMarks != null">f_marks,</if>
             <if test="fInventoryDays != null">f_inventory_days,</if>
-            <if test="fStorageFeeDeadline != null">f_storage_fee_deadline,</if>
             <if test="fAmt != null">f_amt,</if>
             <if test="fBillingDays != null">f_billing_days,</if>
             <if test="fDriverName != null">f_driver_name,</if>
@@ -237,7 +239,6 @@
             <if test="remark != null">#{remark},</if>
             <if test="fMarks != null">#{fMarks},</if>
             <if test="fInventoryDays != null">#{fInventoryDays},</if>
-            <if test="fStorageFeeDeadline != null">#{fStorageFeeDeadline},</if>
             <if test="fAmt != null">#{fAmt},</if>
             <if test="fBillingDays != null">#{fBillingDays},</if>
             <if test="fDriverName != null">#{fDriverName},</if>
@@ -289,7 +290,6 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="fMarks != null">f_marks = #{fMarks},</if>
             <if test="fInventoryDays != null">f_inventory_days = #{fInventoryDays},</if>
-            <if test="fStorageFeeDeadline != null">f_storage_fee_deadline = #{fStorageFeeDeadline},</if>
             <if test="fAmt != null">f_amt = #{fAmt},</if>
             <if test="fBillingDays != null">f_billing_days = #{fBillingDays},</if>
             <if test="fDriverName != null">f_driver_name = #{fDriverName},</if>
@@ -322,15 +322,16 @@
     <select id="selectStorageFeeItemList" parameterType="com.ruoyi.warehouseBusiness.domain.TWarehouseBills"
             resultMap="TWarehousebillsitemsResult">
         SELECT
-        item.*
+            item.*
         FROM
-        t_warehousebills ware
-        LEFT JOIN t_warehousebillsitems item ON item.f_pid = ware.f_id
+            t_warehousebills ware
+            LEFT JOIN t_warehousebillsitems item ON item.f_pid = ware.f_id
         <where>
             ware.f_corpid = #{warehouse.fCorpid}
             and ware.f_billtype in ("HQZY", "SJCK")
+            and item.f_billstatus = "40"
+            and item.f_chargedate &lt; #{warehouse.fBillingDeadline}
             <if test="warehouse.fGoodsid != null">and item.f_goodsid = #{warehouse.fGoodsid}</if>
-            <if test="warehouse.fBillno != null">and ware.f_billno = #{warehouse.fBillno}</if>
             <if test="warehouse.fMblno != null">and ware.f_mblno = #{warehouse.fMblno}</if>
         </where>
     </select>