[CODE]: 对账明细导出

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

@@ -16,7 +16,7 @@ import com.ruoyi.finance.domain.TWareHouseFees;
 import com.ruoyi.finance.excel.Contrast;
 import com.ruoyi.finance.service.ITFeeService;
 import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItem;
+import com.ruoyi.warehouseBusiness.excel.TWareHouseExcelItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

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.TWareHouseExcelItem;
+import com.ruoyi.warehouseBusiness.excel.TWareHouseExcelItem;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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

@@ -10,7 +10,7 @@ import com.ruoyi.finance.excel.Payment;
 import com.ruoyi.reportManagement.excel.Payable;
 import com.ruoyi.reportManagement.excel.Profit;
 import com.ruoyi.reportManagement.excel.Receivable;
-import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItem;
+import com.ruoyi.warehouseBusiness.excel.TWareHouseExcelItem;
 
 import java.util.List;
 import java.util.Map;

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

@@ -29,10 +29,10 @@ import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.mapper.SysConfigMapper;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.warehouseBusiness.domain.BillnoDel;
-import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItem;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
 import com.ruoyi.warehouseBusiness.excel.ListMapToBeanUtils;
+import com.ruoyi.warehouseBusiness.excel.TWareHouseExcelItem;
 import com.ruoyi.warehouseBusiness.mapper.BillnoDelMapper;
 import com.ruoyi.warehouseBusiness.mapper.TWarehouseBillsMapper;
 import com.ruoyi.warehouseBusiness.mapper.TWarehousebillsfeesMapper;
@@ -134,17 +134,17 @@ public class TFeeServiceImpl implements ITFeeService {
                 SysDictData sysDictDataIn =new SysDictData();
                 if(tWarehousebillsfees.getfBilltype().equals("SJRK")){
                     sysDictData.setDictType("st_in_type");
-                    sysDictData.setDictValue(String.valueOf(tWarehousebillsfees.getfFeeunitid()));
+                    sysDictData.setDictValue(String.valueOf(tWarehousebillsfees.getfBusinessType()));
                     sysDictData.setStatus("0");
                     sysDictDataListIn = iSysDictDataService.selectDictDataList(sysDictData);
                 } else if (tWarehousebillsfees.getfBilltype().equals("SJCK")){
                     sysDictData.setDictType("st_out_type");
-                    sysDictData.setDictValue(String.valueOf(tWarehousebillsfees.getfFeeunitid()));
+                    sysDictData.setDictValue(String.valueOf(tWarehousebillsfees.getfBusinessType()));
                     sysDictData.setStatus("0");
                     sysDictDataListIn = iSysDictDataService.selectDictDataList(sysDictData);
-                } else if (tWarehousebillsfees.getfBilltype().equals("HQZY")){
+                } else if (tWarehousebillsfees.getfBilltype().equals("CKDB") | tWarehousebillsfees.getfBilltype().equals("HWTG") ){
                     sysDictData.setDictType("st_trans_type");
-                    sysDictData.setDictValue(String.valueOf(tWarehousebillsfees.getfFeeunitid()));
+                    sysDictData.setDictValue(String.valueOf(tWarehousebillsfees.getfBusinessType()));
                     sysDictData.setStatus("0");
                     sysDictDataListIn = iSysDictDataService.selectDictDataList(sysDictData);
                 }
@@ -177,6 +177,8 @@ public class TFeeServiceImpl implements ITFeeService {
                     map1.put("fBilltype","出库");
                 } else if(tWarehousebills.getfBilltype().equals("CKDB")){
                     map1.put("fBilltype","调拨");
+                }  else if(tWarehousebills.getfBilltype().equals("HWTG")){
+                    map1.put("fBilltype","货物通关");
                 } else if(tWarehousebills.getfBilltype().equals("HQZY")){
                     map1.put("fBilltype","货权转移");
                 }
@@ -558,7 +560,35 @@ public class TFeeServiceImpl implements ITFeeService {
 
     @Override
     public List<TWareHouseExcelItem> selectTWarehousebillsItemsList(Long fId) {
-        return tFeeMapper.selectTWarehousebillsItemsList(fId);
+        List<TWareHouseExcelItem> tWareHouseExcelItemList = tFeeMapper.selectTWarehousebillsItemsList(fId);
+        List<TWareHouseExcelItem> tWareHouseExcelItemList1 = new ArrayList<>();
+        for (TWareHouseExcelItem tWareHouseExcelItem : tWareHouseExcelItemList){
+            if(StringUtils.isNotNull(tWareHouseExcelItem.getfBusinessType())){
+                List<SysDictData> sysDictDataListIn = new ArrayList<>();
+                SysDictData sysDictData =new SysDictData();
+                if(tWareHouseExcelItem.getfBilltype().equals("入库")){
+                    sysDictData.setDictType("st_in_type");
+                    sysDictData.setDictValue(String.valueOf(tWareHouseExcelItem.getfBusinessType()));
+                    sysDictData.setStatus("0");
+                    sysDictDataListIn = iSysDictDataService.selectDictDataList(sysDictData);
+                } else if (tWareHouseExcelItem.getfBilltype().equals("出库")){
+                    sysDictData.setDictType("st_out_type");
+                    sysDictData.setDictValue(String.valueOf(tWareHouseExcelItem.getfBusinessType()));
+                    sysDictData.setStatus("0");
+                    sysDictDataListIn = iSysDictDataService.selectDictDataList(sysDictData);
+                } else if (tWareHouseExcelItem.getfBilltype().equals("调拨") | tWareHouseExcelItem.getfBilltype().equals("货物通关") ){
+                    sysDictData.setDictType("st_trans_type");
+                    sysDictData.setDictValue(String.valueOf(tWareHouseExcelItem.getfBusinessType()));
+                    sysDictData.setStatus("0");
+                    sysDictDataListIn = iSysDictDataService.selectDictDataList(sysDictData);
+                }
+                if(null!=sysDictDataListIn && sysDictDataListIn.size()>0){
+                    tWareHouseExcelItem.setfBusinessType(sysDictDataListIn.get(0).getDictLabel());
+                }
+            }
+            tWareHouseExcelItemList1.add(tWareHouseExcelItem);
+        }
+        return tWareHouseExcelItemList1;
     }
 
     @Override

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWareHouseExcelItem.java → ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/TWareHouseExcelItem.java

@@ -1,9 +1,7 @@
-package com.ruoyi.warehouseBusiness.domain;
+package com.ruoyi.warehouseBusiness.excel;
 
 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;
@@ -18,17 +16,26 @@ public class TWareHouseExcelItem {
     @Excel(name = "提单号")
     private String fMblno;
 
-    /** 类型 */
-    @Excel(name = "类型")
-    private String fBilltype;
+    /** 业务日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBsdate;
 
-    /** 货名 */
-    @Excel(name = "货名")
-    private String fGoodsid;
+    /**
+     * 费用名称
+     */
+    @Excel(name = "费用名称")
+    private String fFeeid;
 
-    /** 品牌 */
-    @Excel(name = "品牌")
-    private String fMarks;
+    /**
+     * 收/付
+     */
+    @Excel(name = "收/付")
+    private String fSrcdc;
+
+    /** 金额 */
+    @Excel(name = "金额")
+    private BigDecimal fAmtdr;
 
     /**
      * 计价单位(数据字典),对应，t_unitfees f_id，如果选择为毛重，数量（f_qty）取主表的毛重，如果选择净重，取主表的净重，如果为箱量，取主表的箱量
@@ -46,176 +53,197 @@ public class TWareHouseExcelItem {
     @Excel(name = "单价")
     private BigDecimal fUnitprice;
 
-    /** 业务日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fBsdate;
+    /** 本次金额 */
+    @Excel(name = "本次金额")
+    private BigDecimal fAmt;
 
-    /** 出库时间 */
+    /** 作业类型 */
+    @Excel(name = "作业类型")
+    private String fBusinessType;
+
+    /** 业务类型 */
+    @Excel(name = "业务类型")
+    private String fBilltype;
+
+    /** 货名 */
+    @Excel(name = "货物品名")
+    private String fGoodsid;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String fMarks;
+
+    /** 计费起始日期 */
     @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 BigDecimal fAmt;
-
-    /**
-     * 费用名称
-     */
-    @Excel(name = "费用名称")
-    private String fFeeid;
+    /** 库存天数 */
+    @Excel(name = "库存天数")
+    private Long fInventoryDays;
 
-    /** 金额 */
-    @Excel(name = "金额")
-    private BigDecimal fAmt2;
+    /** 备注 */
+    @Excel(name = "备注")
+    private String fRemarks;
 
+    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 getfMblno() {
+        return fMblno;
     }
-    public void setfMblno(String fMblno)
-    {
+
+    public void setfMblno(String fMblno) {
         this.fMblno = fMblno;
     }
 
-    public String getfMblno()
-    {
-        return fMblno;
+    public Date getfBsdate() {
+        return fBsdate;
     }
-    public void setfBilltype(String fBilltype)
-    {
-        this.fBilltype = fBilltype;
+
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
     }
 
-    public String getfBilltype()
-    {
-        return fBilltype;
+    public String getfFeeid() {
+        return fFeeid;
     }
-    public void setfGoodsid(String fGoodsid)
-    {
-        this.fGoodsid = fGoodsid;
+
+    public void setfFeeid(String fFeeid) {
+        this.fFeeid = fFeeid;
     }
 
-    public String getfGoodsid()
-    {
-        return fGoodsid;
+    public String getfSrcdc() {
+        return fSrcdc;
     }
-    public void setfMarks(String fMarks)
-    {
-        this.fMarks = fMarks;
+
+    public void setfSrcdc(String fSrcdc) {
+        this.fSrcdc = fSrcdc;
     }
 
-    public String getfMarks()
-    {
-        return fMarks;
+    public BigDecimal getfAmtdr() {
+        return fAmtdr;
     }
-    public void setfBillingQty(BigDecimal fBillingQty)
-    {
-        this.fBillingQty = fBillingQty;
+
+    public void setfAmtdr(BigDecimal fAmtdr) {
+        this.fAmtdr = fAmtdr;
     }
 
-    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 BigDecimal getfBillingQty() {
+        return fBillingQty;
     }
-    public void setfInventoryDays(Long fInventoryDays)
-    {
-        this.fInventoryDays = fInventoryDays;
+
+    public void setfBillingQty(BigDecimal fBillingQty) {
+        this.fBillingQty = fBillingQty;
     }
 
-    public Long getfInventoryDays()
-    {
-        return fInventoryDays;
+    public BigDecimal getfUnitprice() {
+        return fUnitprice;
     }
-    public void setfBillingDays(Long fBillingDays)
-    {
-        this.fBillingDays = fBillingDays;
+
+    public void setfUnitprice(BigDecimal fUnitprice) {
+        this.fUnitprice = fUnitprice;
     }
 
-    public Long getfBillingDays()
-    {
-        return fBillingDays;
+    public BigDecimal getfAmt() {
+        return fAmt;
     }
-    public void setfAmt(BigDecimal fAmt)
-    {
+
+    public void setfAmt(BigDecimal fAmt) {
         this.fAmt = fAmt;
     }
 
-    public BigDecimal getfAmt()
-    {
-        return fAmt;
+    public String getfBusinessType() {
+        return fBusinessType;
     }
 
-    public String getfFeeid() {
-        return fFeeid;
+    public void setfBusinessType(String fBusinessType) {
+        this.fBusinessType = fBusinessType;
     }
 
-    public void setfFeeid(String fFeeid) {
-        this.fFeeid = fFeeid;
+    public String getfBilltype() {
+        return fBilltype;
     }
 
-    public BigDecimal getfAmt2() {
-        return fAmt2;
+    public void setfBilltype(String fBilltype) {
+        this.fBilltype = fBilltype;
     }
 
-    public void setfAmt2(BigDecimal fAmt2) {
-        this.fAmt2 = fAmt2;
+    public String getfGoodsid() {
+        return fGoodsid;
     }
 
-    public String getfFeeunitid() {
-        return fFeeunitid;
+    public void setfGoodsid(String fGoodsid) {
+        this.fGoodsid = fGoodsid;
     }
 
-    public void setfFeeunitid(String fFeeunitid) {
-        this.fFeeunitid = fFeeunitid;
+    public String getfMarks() {
+        return fMarks;
     }
 
-    public BigDecimal getfUnitprice() {
-        return fUnitprice;
+    public void setfMarks(String fMarks) {
+        this.fMarks = fMarks;
     }
 
-    public void setfUnitprice(BigDecimal fUnitprice) {
-        this.fUnitprice = fUnitprice;
+    public Date getfChargedate() {
+        return fChargedate;
+    }
+
+    public void setfChargedate(Date fChargedate) {
+        this.fChargedate = fChargedate;
+    }
+
+    public Date getfBillingDeadline() {
+        return fBillingDeadline;
+    }
+
+    public void setfBillingDeadline(Date fBillingDeadline) {
+        this.fBillingDeadline = fBillingDeadline;
+    }
+
+    public Long getfBillingDays() {
+        return fBillingDays;
+    }
+
+    public void setfBillingDays(Long fBillingDays) {
+        this.fBillingDays = fBillingDays;
+    }
+
+    public Long getfInventoryDays() {
+        return fInventoryDays;
     }
 
-    @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 setfInventoryDays(Long fInventoryDays) {
+        this.fInventoryDays = fInventoryDays;
+    }
+
+    public String getfRemarks() {
+        return fRemarks;
     }
 
+    public void setfRemarks(String fRemarks) {
+        this.fRemarks = fRemarks;
+    }
 }

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

@@ -654,33 +654,46 @@
     </select>
 
     <select id="selectTWarehousebillsItemsList"
-            resultType="com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItem">
+            resultType="com.ruoyi.warehouseBusiness.excel.TWareHouseExcelItem">
         SELECT
             ( @ii := @ii + 1 ) AS fId,
-            wi.src_bill_no AS fMblno,
+            wi.f_mblno AS fMblno,
+            wi.f_bsdate AS fBsdate,
+            f.f_name AS fFeeid,
+            CASE
+                WHEN w.f_srcdc = 'D' THEN
+                    '收'
+                WHEN w.f_srcdc = 'C' THEN
+                    '付'
+                END AS fSrcdc,
+            w.f_amtdr AS fAmtdr,
+            dict.dict_label AS fFeeunitid,
+            wi.f_qty AS fBillingQty,
+            wi.f_unitprice AS fUnitprice,
+            w.f_amt AS fAmt,
+            wi.f_business_type AS fBusinessType,
             CASE
                 wi.f_billtype
-                WHEN  'SJRK' THEN
+                WHEN 'SJRK' THEN
                     '入库'
-                WHEN  'SJCK' THEN
+                WHEN 'SJCK' THEN
                     '出库'
-                WHEN  'HQZY' THEN
+                WHEN 'HQZY' THEN
                     '货转'
-                WHEN  'CKDB' THEN
+                WHEN 'CKDB' THEN
                     '调拨'
+                WHEN 'HWTG' THEN
+                    '货物通关'
                 WHEN 'KCZZ' THEN
                     '库存总账'
                 END AS fBilltype,
             wi.f_product_name AS fGoodsid,
             wi.f_marks AS fMarks,
-            dict.dict_label AS fFeeunitid,
-            wi.f_qty AS fBillingQty,
-            wi.f_unitprice  AS fUnitprice,
-            wi.f_bsdate AS fBsdate,
+            wi.f_chargedate AS fChargedate,
+            wi.f_billing_deadline AS fBillingDeadline,
             wi.f_inventory_days AS fInventoryDays,
             wi.f_billing_days AS fBillingDays,
-            f.f_name AS fFeeid,
-            w.f_amt AS fAmt2
+            w.f_remarks AS fRemarks
         FROM
             t_fee_do w
                 LEFT JOIN t_warehousebillsfees wi ON w.f_srcid = wi.f_id