Merge remote-tracking branch 'origin/dev' into dev

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWareHouseExcelItems.java

@@ -76,6 +76,18 @@ public class TWareHouseExcelItems {
     @Excel(name = "备注")
     private String  remark;
 
+    /** 计费日期 */
+    @Excel(name = "计费日期")
+    private String  priceDateRemarks;
+
+    public String getPriceDateRemarks() {
+        return priceDateRemarks;
+    }
+
+    public void setPriceDateRemarks(String priceDateRemarks) {
+        this.priceDateRemarks = priceDateRemarks;
+    }
+
     public String getfId() {
         return fId;
     }

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -470,8 +470,9 @@
             wh.f_corpid = #{warehouse.fCorpid}
             and ware.f_charg = 1
             and wh.f_chargedate < #{warehouse.fBillingDeadline}
-            <if test="warehouse.fGoodsid != null">and wh.f_goodsid = #{warehouse.fGoodsid}</if>
-            <if test="warehouse.fMblno != null">and wh.f_mblno = #{warehouse.fMblno}</if>
+            <if test="warehouse.fGoodsid != null and warehouse.fGoodsid != ''">and wh.f_goodsid = #{warehouse.fGoodsid}</if>
+            <if test="warehouse.fMblno != null and warehouse.fMblno != ''">and wh.f_mblno = #{warehouse.fMblno}</if>
+            <if test="warehouse.fWarehouseid != null and warehouse.fWarehouseid != ''">and wh.f_warehouseid = #{warehouse.fWarehouseid}</if>
         </where>
     </select>
 

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

@@ -586,6 +586,7 @@
             wi.f_billing_days AS fBillingDays,
             wi.f_inventory_days AS fInventoryDays,
             wi.f_amt AS fAmt,
+            wi.price_date_remarks AS priceDateRemarks,
             wi.remark AS remark
         FROM
             t_warehousebills w

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

@@ -477,8 +477,9 @@
             and item.f_billstatus = 40
             and item.f_storage_fee_deadline IS NULL
             and IF(ware.f_billtype = "SJCK", item.f_bsdate <#{warehouse.fBillingDeadline}, item.f_chargedate <= #{warehouse.fBillingDeadline})
-            <if test="warehouse.fGoodsid != null">and item.f_goodsid = #{warehouse.fGoodsid}</if>
-            <if test="warehouse.fMblno != null">and ware.f_mblno = #{warehouse.fMblno}</if>
+            <if test="warehouse.fGoodsid != null and warehouse.fGoodsid != ''">and item.f_goodsid = #{warehouse.fGoodsid}</if>
+            <if test="warehouse.fMblno != null and warehouse.fMblno != ''">and ware.f_mblno = #{warehouse.fMblno}</if>
+            <if test="warehouse.fWarehouseid != null and warehouse.fWarehouseid != ''">and ware.f_warehouseid = #{warehouse.fWarehouseid}</if>
            <!--  <if test="warehouse.fId != null">and item.f_id = #{warehouse.fId}</if> -->
         </where>
     </select>