Selaa lähdekoodia

[CODE]: 对账导出

maxianghua 4 vuotta sitten
vanhempi
commit
e0782f1737

+ 3 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TContrastController.java

@@ -14,6 +14,7 @@ import com.ruoyi.finance.domain.TFee;
 import com.ruoyi.finance.domain.TWareHouseFees;
 import com.ruoyi.finance.service.ITFeeService;
 import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItem;
 import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -156,8 +157,8 @@ public class TContrastController extends BaseController {
      */
     @GetMapping("/exportItems/{fId}")
     public AjaxResult exportItems(@PathVariable("fId") Long fId) {
-        List<TWareHouseExcelItems> list = tFeeService.selectTWarehousebillsItemsList(fId);
-        ExcelUtil<TWareHouseExcelItems> util = new ExcelUtil<TWareHouseExcelItems>(TWareHouseExcelItems.class);
+        List<TWareHouseExcelItem> list = tFeeService.selectTWarehousebillsItemsList(fId);
+        ExcelUtil<TWareHouseExcelItem> util = new ExcelUtil<TWareHouseExcelItem>(TWareHouseExcelItem.class);
         return util.exportExcel(list, "warehousebills");
     }
 }

+ 2 - 2
ruoyi-warehouse/src/main/java/com/ruoyi/finance/mapper/TFeeMapper.java

@@ -2,7 +2,7 @@ package com.ruoyi.finance.mapper;
 
 import com.ruoyi.finance.domain.TFee;
 import com.ruoyi.finance.domain.TWareHouseFees;
-import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
+import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItem;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -81,5 +81,5 @@ public interface TFeeMapper {
      * @param fid
      * @return 详情主表集合
      */
-    public List<TWareHouseExcelItems> selectTWarehousebillsItemsList(@Param("fId") Long fid);
+    public List<TWareHouseExcelItem> selectTWarehousebillsItemsList(@Param("fId") Long fid);
 }

+ 2 - 2
ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/ITFeeService.java

@@ -4,7 +4,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.finance.domain.TFee;
 import com.ruoyi.finance.domain.TWareHouseFees;
-import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
+import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItem;
 
 import java.util.List;
 import java.util.Map;
@@ -105,5 +105,5 @@ public interface ITFeeService {
      * @param fId
      * @return
      */
-    public List<TWareHouseExcelItems> selectTWarehousebillsItemsList(Long  fId);
+    public List<TWareHouseExcelItem> selectTWarehousebillsItemsList(Long  fId);
 }

+ 1 - 1
ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -503,7 +503,7 @@ public class TFeeServiceImpl implements ITFeeService {
     }
 
     @Override
-    public List<TWareHouseExcelItems> selectTWarehousebillsItemsList(Long fId) {
+    public List<TWareHouseExcelItem> selectTWarehousebillsItemsList(Long fId) {
         return tFeeMapper.selectTWarehousebillsItemsList(fId);
     }
 

+ 175 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWareHouseExcelItem.java

@@ -0,0 +1,175 @@
+package com.ruoyi.warehouseBusiness.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TWareHouseExcelItem {
+
+    /** 提单号 */
+    @Excel(name = "序号")
+    private String fId;
+
+    /** 提单号 */
+    @Excel(name = "提单号")
+    private String fMblno;
+
+    /** 类型 */
+    @Excel(name = "类型")
+    private String fBilltype;
+
+    /** 货名 */
+    @Excel(name = "货名")
+    private String fGoodsid;
+
+    /** 品牌 */
+    @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;
+
+    /** 出库时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出库时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBsdate1;
+
+    /** 堆存天数 */
+    @Excel(name = "堆存天数")
+    private Long fInventoryDays;
+
+    /** 计费天数 */
+    @Excel(name = "计费天数")
+    private Long fBillingDays;
+
+    /** 货物堆存费 */
+    @Excel(name = "货物堆存费")
+    private BigDecimal fAmt;
+
+    /** 装卸费 */
+    @Excel(name = "装卸费")
+    private BigDecimal fAmt1;
+
+    /** 金额 */
+    @Excel(name = "金额")
+    private BigDecimal fAmt2;
+
+
+    public void setfId(String fId)
+    {
+        this.fId = fId;
+    }
+
+    public String getfId()
+    {
+        return fId;
+    }
+    public void setfMblno(String fMblno)
+    {
+        this.fMblno = fMblno;
+    }
+
+    public String getfMblno()
+    {
+        return fMblno;
+    }
+    public void setfBilltype(String fBilltype)
+    {
+        this.fBilltype = fBilltype;
+    }
+
+    public String getfBilltype()
+    {
+        return fBilltype;
+    }
+    public void setfGoodsid(String fGoodsid)
+    {
+        this.fGoodsid = fGoodsid;
+    }
+
+    public String getfGoodsid()
+    {
+        return fGoodsid;
+    }
+    public void setfMarks(String fMarks)
+    {
+        this.fMarks = fMarks;
+    }
+
+    public String getfMarks()
+    {
+        return fMarks;
+    }
+    public void setfBillingQty(BigDecimal fBillingQty)
+    {
+        this.fBillingQty = fBillingQty;
+    }
+
+    public BigDecimal getfBillingQty()
+    {
+        return fBillingQty;
+    }
+    public void setfBsdate(Date fBsdate)
+    {
+        this.fBsdate = fBsdate;
+    }
+
+    public Date getfBsdate()
+    {
+        return fBsdate;
+    }
+    public void setfInventoryDays(Long fInventoryDays)
+    {
+        this.fInventoryDays = fInventoryDays;
+    }
+
+    public Long getfInventoryDays()
+    {
+        return fInventoryDays;
+    }
+    public void setfBillingDays(Long fBillingDays)
+    {
+        this.fBillingDays = fBillingDays;
+    }
+
+    public Long getfBillingDays()
+    {
+        return fBillingDays;
+    }
+    public void setfAmt(BigDecimal fAmt)
+    {
+        this.fAmt = fAmt;
+    }
+
+    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();
+    }
+
+}

+ 5 - 4
ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -498,7 +498,7 @@
     </select>
 
     <select id="selectTWarehousebillsItemsList"
-            resultType="com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems">
+            resultType="com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItem">
         SELECT
             ( @ii := @ii + 1 ) AS fId,
             wi.src_bill_no AS fMblno,
@@ -517,15 +517,16 @@
                 END AS fBilltype,
             wi.f_product_name AS fGoodsid,
             wi.f_marks AS fMarks,
-            wi.f_billing_qty AS fBillingQty,
+            wi.f_qty AS fBillingQty,
             wi.f_bsdate AS fBsdate,
             wi.f_inventory_days AS fInventoryDays,
             wi.f_billing_days AS fBillingDays,
-            wi.f_amt AS fAmt,
-            wi.f_amt AS fAmt2
+            f.f_name AS fFeeid,
+            wi.f_accamount AS fAmt2
         FROM
             t_fee_do w
                 LEFT JOIN t_warehousebillsfees wi ON w.f_srcid = wi.f_id
+                LEFT JOIN t_fees  f ON wi.f_feeid = f.f_id
            ,(
             SELECT
                 @ii := 0