[CODE]: 计算仓储费导出

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TStorageFeeCalculationController.java

@@ -144,7 +144,7 @@ public class TStorageFeeCalculationController extends BaseController {
     public AjaxResult exportItems(@PathVariable("fId") Long fId) {
         List<TWareHouseExcelItems> list = itWarehouseBillsService.selectTWarehousebillsItemsList(fId);
         ExcelUtil<TWareHouseExcelItems> util = new ExcelUtil<TWareHouseExcelItems>(TWareHouseExcelItems.class);
-        return util.exportExcel(list, "warehousebills");
+        return util.exportExcel(list, "计算仓储费");
     }
 
 }

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

@@ -15,162 +15,172 @@ public class TWareHouseExcelItems {
     @Excel(name = "序号")
     private String fId;
 
+    /** 类型 */
+    @Excel(name = "业务来源")
+    private String fBilltype;
+
     /** 提单号 */
-    @Excel(name = "提单号")
+    @Excel(name = "业务单号")
     private String fMblno;
 
-    /** 类型 */
-    @Excel(name = "类型")
-    private String fBilltype;
 
     /** 货名 */
-    @Excel(name = "货名")
+    @Excel(name = "货物货名")
     private String fGoodsid;
 
     /** 品牌 */
-    @Excel(name = "品牌")
+    @Excel(name = "唛头")
     private String fMarks;
 
-    /** 重量 */
-    @Excel(name = "重量")
-    private BigDecimal fBillingQty;
-
     /** 业务日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fBsdate;
 
-    /** 出库时间 */
+    /** 提单号 */
+    @Excel(name = "计费单位")
+    private String fFeeUnitid;
+
+    /** 重量 */
+    @Excel(name = "计费数量")
+    private BigDecimal fBillingQty;
+
+    /** 计费起始日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "出库时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fBsdate1;
+    @Excel(name = "计费起始日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fChargedate;
 
-    /** 堆存天数 */
-    @Excel(name = "堆存天数")
-    private Long fInventoryDays;
+    /** 计费起始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计费截止日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBillingDeadline;
 
     /** 计费天数 */
     @Excel(name = "计费天数")
     private Long fBillingDays;
 
+    /** 堆存天数 */
+    @Excel(name = "库存天数")
+    private Long fInventoryDays;
+
+
     /** 货物堆存费 */
-    @Excel(name = "货物堆存费")
+    @Excel(name = "计费金额")
     private BigDecimal fAmt;
 
-    /** 装卸费 */
-    @Excel(name = "装卸费")
-    private BigDecimal fAmt1;
-
-    /** 金额 */
-    @Excel(name = "金额")
-    private BigDecimal fAmt2;
+    /** 备注 */
+    @Excel(name = "备注")
+    private String  remark;
 
+    public String getfId() {
+        return fId;
+    }
 
-    public void setfId(String fId)
-    {
+    public void setfId(String fId) {
         this.fId = fId;
     }
 
-    public String getfId()
-    {
-        return fId;
+    public String getfBilltype() {
+        return fBilltype;
     }
-    public void setfMblno(String fMblno)
-    {
-        this.fMblno = fMblno;
+
+    public void setfBilltype(String fBilltype) {
+        this.fBilltype = fBilltype;
     }
 
-    public String getfMblno()
-    {
+    public String getfMblno() {
         return fMblno;
     }
-    public void setfBilltype(String fBilltype)
-    {
-        this.fBilltype = fBilltype;
+
+    public void setfMblno(String fMblno) {
+        this.fMblno = fMblno;
     }
 
-    public String getfBilltype()
-    {
-        return fBilltype;
+    public String getfGoodsid() {
+        return fGoodsid;
     }
-    public void setfGoodsid(String fGoodsid)
-    {
+
+    public void setfGoodsid(String fGoodsid) {
         this.fGoodsid = fGoodsid;
     }
 
-    public String getfGoodsid()
-    {
-        return fGoodsid;
+    public String getfMarks() {
+        return fMarks;
     }
-    public void setfMarks(String fMarks)
-    {
+
+    public void setfMarks(String fMarks) {
         this.fMarks = fMarks;
     }
 
-    public String getfMarks()
-    {
-        return fMarks;
+    public Date getfBsdate() {
+        return fBsdate;
     }
-    public void setfBillingQty(BigDecimal fBillingQty)
-    {
-        this.fBillingQty = fBillingQty;
+
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
     }
 
-    public BigDecimal getfBillingQty()
-    {
-        return fBillingQty;
+    public String getfFeeUnitid() {
+        return fFeeUnitid;
     }
-    public void setfBsdate(Date fBsdate)
-    {
-        this.fBsdate = fBsdate;
+
+    public void setfFeeUnitid(String fFeeUnitid) {
+        this.fFeeUnitid = fFeeUnitid;
     }
 
-    public Date getfBsdate()
-    {
-        return fBsdate;
+    public Date getfChargedate() {
+        return fChargedate;
     }
-    public void setfInventoryDays(Long fInventoryDays)
-    {
-        this.fInventoryDays = fInventoryDays;
+
+    public void setfChargedate(Date fChargedate) {
+        this.fChargedate = fChargedate;
     }
 
-    public Long getfInventoryDays()
-    {
-        return fInventoryDays;
+    public Date getfBillingDeadline() {
+        return fBillingDeadline;
     }
-    public void setfBillingDays(Long fBillingDays)
-    {
-        this.fBillingDays = fBillingDays;
+
+    public void setfBillingDeadline(Date fBillingDeadline) {
+        this.fBillingDeadline = fBillingDeadline;
     }
 
-    public Long getfBillingDays()
-    {
+    public BigDecimal getfBillingQty() {
+        return fBillingQty;
+    }
+
+    public void setfBillingQty(BigDecimal fBillingQty) {
+        this.fBillingQty = fBillingQty;
+    }
+
+    public Long getfBillingDays() {
         return fBillingDays;
     }
-    public void setfAmt(BigDecimal fAmt)
-    {
-        this.fAmt = fAmt;
+
+    public void setfBillingDays(Long fBillingDays) {
+        this.fBillingDays = fBillingDays;
     }
 
-    public BigDecimal getfAmt()
-    {
+    public Long getfInventoryDays() {
+        return fInventoryDays;
+    }
+
+    public void setfInventoryDays(Long fInventoryDays) {
+        this.fInventoryDays = fInventoryDays;
+    }
+
+    public BigDecimal getfAmt() {
         return fAmt;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("fId", getfId())
-                .append("fMblno", getfMblno())
-                .append("fBilltype", getfBilltype())
-                .append("fGoodsid", getfGoodsid())
-                .append("fMarks", getfMarks())
-                .append("fBillingQty", getfBillingQty())
-                .append("fBsdate", getfBsdate())
-                .append("fInventoryDays", getfInventoryDays())
-                .append("fBillingDays", getfBillingDays())
-                .append("fAmt", getfAmt())
-                .toString();
+    public void setfAmt(BigDecimal fAmt) {
+        this.fAmt = fAmt;
+    }
+
+    public String getRemark() {
+        return remark;
     }
 
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

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

@@ -476,7 +476,6 @@
             resultType="com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems">
         SELECT
             ( @ii := @ii + 1 ) AS fId,
-            wi.src_bill_no AS fMblno,
             CASE
                 wi.f_billtype
                 WHEN  'SJRK' THEN
@@ -486,27 +485,30 @@
                 WHEN 'KCZZ' THEN
                     '库存总账'
                 END AS fBilltype,
+            wi.src_bill_no AS fMblno,
             wi.f_product_name AS fGoodsid,
             wi.f_marks AS fMarks,
-            /*'' AS fBillingQty1,*/
-            wi.f_billing_qty AS fBillingQty,
-            /*'' AS fBillingQty2,*/
             wi.f_bsdate AS fBsdate,
-            /*'' AS fBsdate1,*/
-            wi.f_inventory_days AS fInventoryDays,
+            dict.dict_label AS fFeeUnitid,
+            wi.f_billing_qty AS fBillingQty,
+            wi.f_chargedate AS fChargedate,
+            wi.f_billing_deadline AS fBillingDeadline,
             wi.f_billing_days AS fBillingDays,
+            wi.f_inventory_days AS fInventoryDays,
             wi.f_amt AS fAmt,
-            /*'' AS fAmt1,*/
-            wi.f_amt AS fAmt2
+            wi.remark AS remark
         FROM
             t_warehousebills w
                 LEFT JOIN t_warehousebillsfees wi ON w.f_id = wi.f_pid
+                LEFT JOIN sys_dict_data dict ON dict.dict_value = wi.f_feeUnitid
                 ,(
                 SELECT
                     @ii := 0
             ) AS ii
         WHERE
             w.f_id = #{fId}
+            AND dict.status = '0'
+            AND dict.dict_type = 'data_unitfees'
     </select>
 
     <select id="selectInventorySJRKList" parameterType="TWarehousebills"  resultType="java.util.Map">