Merge remote-tracking branch 'origin/master'

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

@@ -13,6 +13,8 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.finance.domain.TFee;
 import com.ruoyi.finance.domain.TWareHouseFees;
+import com.ruoyi.finance.excel.Charge;
+import com.ruoyi.finance.excel.Detailed;
 import com.ruoyi.finance.service.ITFeeService;
 import com.ruoyi.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,10 +56,11 @@ public class TChargeController extends BaseController {
     @Log(title = "财务数据主", businessType = BusinessType.EXPORT)
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
-    public AjaxResult export(TFee tFee) {
-        List<TFee> list = tFeeService.selectTFeeList(tFee);
-        ExcelUtil<TFee> util = new ExcelUtil<TFee>(TFee.class);
-        return util.exportExcel(list, "fee");
+    public AjaxResult export(TFee tFee) throws Exception {
+        tFee.setfBilltype("SF");
+        List<Charge> list = tFeeService.chargeExport(tFee);
+        ExcelUtil<Charge> util = new ExcelUtil<Charge>(Charge.class);
+        return util.exportExcel(list, "收费");
     }
 
     /**
@@ -155,5 +158,15 @@ public class TChargeController extends BaseController {
         return tFeeService.revoke(tFee,tFeeDo,loginUser,billsType);
     }
 
+    /**
+     * 导出入库详情主表列表
+     */
+    @GetMapping("/exportItems/{fId}")
+    public AjaxResult exportItems(@PathVariable("fId") Long fId) {
+        List<Detailed> list = tFeeService.selectDetailedList(fId);
+        String exportName = tFeeService.findCtrlcorpid(fId);
+        ExcelUtil<Detailed> util = new ExcelUtil<Detailed>(Detailed.class);
+        return util.exportExcel(list, exportName);
+    }
 
 }

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-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TPaymentController.java

@@ -13,6 +13,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.finance.domain.TFee;
 import com.ruoyi.finance.domain.TWareHouseFees;
+import com.ruoyi.finance.excel.Payment;
 import com.ruoyi.finance.service.ITFeeService;
 import com.ruoyi.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,10 +55,11 @@ public class TPaymentController extends BaseController {
     @Log(title = "财务数据主", businessType = BusinessType.EXPORT)
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
-    public AjaxResult export(TFee tFee) {
-        List<TFee> list = tFeeService.selectTFeeList(tFee);
-        ExcelUtil<TFee> util = new ExcelUtil<TFee>(TFee.class);
-        return util.exportExcel(list, "fee");
+    public AjaxResult export(TFee tFee) throws Exception {
+        tFee.setfBilltype("SF");
+        List<Payment> list = tFeeService.paymentExport(tFee);
+        ExcelUtil<Payment> util = new ExcelUtil<Payment>(Payment.class);
+        return util.exportExcel(list, "付费");
     }
 
     /**

ruoyi-warehouse/src/main/java/com/ruoyi/finance/excel/Charge.java

@@ -15,6 +15,13 @@ public class Charge {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 结算单位
+     */
+    @Excel(name = "制单人")
+    private String createBy;
+
+
+    /**
      * 系统编号
      */
     @Excel(name = "系统编号")
@@ -27,17 +34,19 @@ public class Charge {
     @Excel(name = "货权方")
     private String fCtrlcorpid;
 
+
     /**
-     * 结算单位
+     * 入（出）库日期
      */
-    @Excel(name = "结算单位")
-    private String fCorpidName;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "账单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createTime;
 
     /**
      * 入（出）库日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "账单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "收费日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fAccbilldate;
 
 
@@ -47,17 +56,43 @@ public class Charge {
     @Excel(name = "提单号")
     private String tMblno;
 
+    /**
+     * 提单号
+     */
+    @Excel(name = "收费方式")
+    private String chargingMethod;
+
+
+    /**
+     * 提单号
+     */
+    @Excel(name = "发票号")
+    private String invoiceNo;
+
+    /**
+     * 提单号
+     */
+    @Excel(name = "收款银行")
+    private String bank;
+
+    /**
+     * 提单号
+     */
+    @Excel(name = "水单号")
+    private String waterBillNo;
+
+
 
     /**
      * 金额
      */
-    @Excel(name = "金额")
+    @Excel(name = "应收合计")
     private Float fAmtdr;
 
     /**
      * 对账金额
      */
-    @Excel(name = "对账金额")
+    @Excel(name = "实收合计")
     private Float fAmtcr;
 
     /**
@@ -66,6 +101,35 @@ public class Charge {
     @Excel(name = "备注")
     private String fRemarks;
 
+    /**
+     * 状态
+     */
+    @Excel(name = "状态")
+    private String fBillstatus;
+
+    public String getChargingMethod() {
+        return chargingMethod;
+    }
+
+    public void setChargingMethod(String chargingMethod) {
+        this.chargingMethod = chargingMethod;
+    }
+
+    public String getfBillstatus() {
+        return fBillstatus;
+    }
+
+    public void setfBillstatus(String fBillstatus) {
+        this.fBillstatus = fBillstatus;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
 
     public String getfBillno() {
         return fBillno;
@@ -83,12 +147,12 @@ public class Charge {
         this.fCtrlcorpid = fCtrlcorpid;
     }
 
-    public String getfCorpidName() {
-        return fCorpidName;
+    public Date getCreateTime() {
+        return createTime;
     }
 
-    public void setfCorpidName(String fCorpidName) {
-        this.fCorpidName = fCorpidName;
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
     public Date getfAccbilldate() {
@@ -107,6 +171,30 @@ public class Charge {
         this.tMblno = tMblno;
     }
 
+    public String getInvoiceNo() {
+        return invoiceNo;
+    }
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo;
+    }
+
+    public String getBank() {
+        return bank;
+    }
+
+    public void setBank(String bank) {
+        this.bank = bank;
+    }
+
+    public String getWaterBillNo() {
+        return waterBillNo;
+    }
+
+    public void setWaterBillNo(String waterBillNo) {
+        this.waterBillNo = waterBillNo;
+    }
+
     public Float getfAmtdr() {
         return fAmtdr;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/finance/excel/Detailed.java

@@ -0,0 +1,163 @@
+package com.ruoyi.finance.excel;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Detailed {
+
+    /** 提单号 */
+    @Excel(name = "序号")
+    private String fId;
+
+    /** 提单号 */
+    @Excel(name = "提单号")
+    private String fMblno;
+
+    /**
+     * 存货单号
+     */
+    @Excel(name = "存货单号")
+    private String fBscorpno;
+
+    /** 货名 */
+    @Excel(name = "货物品名")
+    private String fGoodsid;
+
+
+    /** 业务日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBsdate;
+
+    /**
+     * 费用名称
+     */
+    @Excel(name = "费用名称")
+    private String fFeeid;
+
+    /**
+     * 收/付
+     */
+    @Excel(name = "收/付")
+    private String fSrcdc;
+
+    /** 业务类型 */
+    @Excel(name = "业务类型")
+    private String fBilltype;
+
+    /** 作业类型 */
+    @Excel(name = "作业类型")
+    private String fBusinessType;
+
+    /** 金额 */
+    @Excel(name = "金额")
+    private BigDecimal fAmtdr;
+
+    /** 本次金额 */
+    @Excel(name = "本次金额")
+    private BigDecimal fAmt;
+
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String fRemarks;
+
+    public String getfId() {
+        return fId;
+    }
+
+    public void setfId(String fId) {
+        this.fId = fId;
+    }
+
+    public String getfMblno() {
+        return fMblno;
+    }
+
+    public void setfMblno(String fMblno) {
+        this.fMblno = fMblno;
+    }
+
+    public String getfBscorpno() {
+        return fBscorpno;
+    }
+
+    public void setfBscorpno(String fBscorpno) {
+        this.fBscorpno = fBscorpno;
+    }
+
+    public String getfGoodsid() {
+        return fGoodsid;
+    }
+
+    public void setfGoodsid(String fGoodsid) {
+        this.fGoodsid = fGoodsid;
+    }
+
+    public Date getfBsdate() {
+        return fBsdate;
+    }
+
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
+    }
+
+    public String getfFeeid() {
+        return fFeeid;
+    }
+
+    public void setfFeeid(String fFeeid) {
+        this.fFeeid = fFeeid;
+    }
+
+    public String getfSrcdc() {
+        return fSrcdc;
+    }
+
+    public void setfSrcdc(String fSrcdc) {
+        this.fSrcdc = fSrcdc;
+    }
+
+    public String getfBilltype() {
+        return fBilltype;
+    }
+
+    public void setfBilltype(String fBilltype) {
+        this.fBilltype = fBilltype;
+    }
+
+    public String getfBusinessType() {
+        return fBusinessType;
+    }
+
+    public void setfBusinessType(String fBusinessType) {
+        this.fBusinessType = fBusinessType;
+    }
+
+    public BigDecimal getfAmtdr() {
+        return fAmtdr;
+    }
+
+    public void setfAmtdr(BigDecimal fAmtdr) {
+        this.fAmtdr = fAmtdr;
+    }
+
+    public BigDecimal getfAmt() {
+        return fAmt;
+    }
+
+    public void setfAmt(BigDecimal fAmt) {
+        this.fAmt = fAmt;
+    }
+
+    public String getfRemarks() {
+        return fRemarks;
+    }
+
+    public void setfRemarks(String fRemarks) {
+        this.fRemarks = fRemarks;
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/finance/excel/Payment.java

@@ -15,6 +15,13 @@ public class Payment {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 结算单位
+     */
+    @Excel(name = "制单人")
+    private String createBy;
+
+
+    /**
      * 系统编号
      */
     @Excel(name = "系统编号")
@@ -27,17 +34,19 @@ public class Payment {
     @Excel(name = "货权方")
     private String fCtrlcorpid;
 
+
     /**
-     * 结算单位
+     * 入（出）库日期
      */
-    @Excel(name = "结算单位")
-    private String fCorpidName;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "账单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createTime;
 
     /**
      * 入（出）库日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "账单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "收费日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fAccbilldate;
 
 
@@ -47,17 +56,43 @@ public class Payment {
     @Excel(name = "提单号")
     private String tMblno;
 
+    /**
+     * 提单号
+     */
+    @Excel(name = "收费方式")
+    private String chargingMethod;
+
+
+    /**
+     * 提单号
+     */
+    @Excel(name = "发票号")
+    private String invoiceNo;
+
+    /**
+     * 提单号
+     */
+    @Excel(name = "收款银行")
+    private String bank;
+
+    /**
+     * 提单号
+     */
+    @Excel(name = "水单号")
+    private String waterBillNo;
+
+
 
     /**
      * 金额
      */
-    @Excel(name = "金额")
+    @Excel(name = "应付合计")
     private Float fAmtdr;
 
     /**
      * 对账金额
      */
-    @Excel(name = "对账金额")
+    @Excel(name = "实付合计")
     private Float fAmtcr;
 
     /**
@@ -66,6 +101,36 @@ public class Payment {
     @Excel(name = "备注")
     private String fRemarks;
 
+    /**
+     * 状态
+     */
+    @Excel(name = "状态")
+    private String fBillstatus;
+
+    public String getChargingMethod() {
+        return chargingMethod;
+    }
+
+    public void setChargingMethod(String chargingMethod) {
+        this.chargingMethod = chargingMethod;
+    }
+
+    public String getfBillstatus() {
+        return fBillstatus;
+    }
+
+    public void setfBillstatus(String fBillstatus) {
+        this.fBillstatus = fBillstatus;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
     public String getfBillno() {
         return fBillno;
     }
@@ -82,12 +147,12 @@ public class Payment {
         this.fCtrlcorpid = fCtrlcorpid;
     }
 
-    public String getfCorpidName() {
-        return fCorpidName;
+    public Date getCreateTime() {
+        return createTime;
     }
 
-    public void setfCorpidName(String fCorpidName) {
-        this.fCorpidName = fCorpidName;
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
     public Date getfAccbilldate() {
@@ -106,6 +171,30 @@ public class Payment {
         this.tMblno = tMblno;
     }
 
+    public String getInvoiceNo() {
+        return invoiceNo;
+    }
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo;
+    }
+
+    public String getBank() {
+        return bank;
+    }
+
+    public void setBank(String bank) {
+        this.bank = bank;
+    }
+
+    public String getWaterBillNo() {
+        return waterBillNo;
+    }
+
+    public void setWaterBillNo(String waterBillNo) {
+        this.waterBillNo = waterBillNo;
+    }
+
     public Float getfAmtdr() {
         return fAmtdr;
     }

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

@@ -2,7 +2,8 @@ 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.finance.excel.Detailed;
+import com.ruoyi.warehouseBusiness.excel.TWareHouseExcelItem;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -83,4 +84,9 @@ public interface TFeeMapper {
      * @return 详情主表集合
      */
     public List<TWareHouseExcelItem> selectTWarehousebillsItemsList(@Param("fId") Long fid);
+
+    public List<Map<String, Object>> selectFeeList(TFee tFee);
+
+    public List<Detailed> selectDetailedList(@Param("fId") Long fid);
+
 }

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

@@ -4,11 +4,14 @@ 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.finance.excel.Charge;
 import com.ruoyi.finance.excel.Contrast;
+import com.ruoyi.finance.excel.Detailed;
+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;
@@ -123,4 +126,10 @@ public interface ITFeeService {
 
     public List<Contrast> contrastExport(TFee tFee) throws Exception;
 
+    public List<Payment> paymentExport(TFee tFee) throws Exception;
+
+    public List<Charge> chargeExport(TFee tFee) throws Exception;
+
+    public List<Detailed> selectDetailedList(Long  fId);
+
 }

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

@@ -16,7 +16,10 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.finance.domain.TFee;
 import com.ruoyi.finance.domain.TFeeDo;
 import com.ruoyi.finance.domain.TWareHouseFees;
+import com.ruoyi.finance.excel.Charge;
 import com.ruoyi.finance.excel.Contrast;
+import com.ruoyi.finance.excel.Detailed;
+import com.ruoyi.finance.excel.Payment;
 import com.ruoyi.finance.mapper.TFeeDoMapper;
 import com.ruoyi.finance.mapper.TFeeMapper;
 import com.ruoyi.finance.service.ITFeeService;
@@ -27,10 +30,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;
@@ -132,17 +135,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);
                 }
@@ -175,6 +178,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","货权转移");
                 }
@@ -556,7 +561,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
@@ -594,6 +627,53 @@ public class TFeeServiceImpl implements ITFeeService {
         return list1;
     }
 
+    @Override
+    public List<Payment> paymentExport(TFee tFee) throws Exception {
+        List<Map<String, Object>> list = tFeeMapper.selectFeeList(tFee);
+        List<Payment> list1 = ListMapToBeanUtils.castMapToBean(list,Payment.class);
+        return list1;
+    }
+
+    @Override
+    public List<Charge> chargeExport(TFee tFee) throws Exception {
+        List<Map<String, Object>> list = tFeeMapper.selectFeeList(tFee);
+        List<Charge> list1 = ListMapToBeanUtils.castMapToBean(list,Charge.class);
+        return list1;
+    }
+
+    @Override
+    public List<Detailed> selectDetailedList(Long fId) {
+        List<Detailed> detailedList = tFeeMapper.selectDetailedList(fId);
+        List<Detailed> detailedList1 = new ArrayList<>();
+        for (Detailed tWareHouseExcelItem : detailedList){
+            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());
+                }
+            }
+            detailedList1.add(tWareHouseExcelItem);
+        }
+        return detailedList1;
+    }
+
     /**
      *  更新费用明细
      * @param fid

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/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -310,7 +310,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         // 客户
         tWhgenleg.setfCorpid(warehouseBills.getfCorpid());
         // 提单号
-        if ("HQZY".equals(warehouseBills.getfBilltype()) || "CKDB".equals(warehouseBills.getfBilltype())) {
+        if ("HQZY".equals(warehouseBills.getfBilltype()) || "CKDB".equals(warehouseBills.getfBilltype()) || "HWTG".equals(warehouseBills.getfBilltype())  ) {
             tWhgenleg.setfMblno(warehousebillsitems.getfMblno());
         } else {
             tWhgenleg.setfMblno(warehouseBills.getfMblno());
@@ -880,7 +880,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
         tWarehousebillsitems.setfSerialNumber(tWarehousebillsitems1.getfSerialNumber());
         int  num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(tWarehousebillsitems);
-        if (num <= 0) {
+        // 主表变更状态
+        TWarehouseBills tWarehousebills = new TWarehouseBills();
+        tWarehousebills.setfId(tWarehousebillsitems1.getfPid());
+        tWarehousebills.setfItemsStatus(3L);
+        int  num1 = tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
+        if (num <= 0  && num1 <= 0 ) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新库存明细失败");
         }else{

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

@@ -59,7 +59,6 @@
     <insert id="insertTFeeDo" parameterType="TFeeDo" useGeneratedKeys="true" keyProperty="fId">
         insert into t_fee_do
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="fId != null">f_id,</if>
             <if test="fPid != null">f_pid,</if>
             <if test="fActId != null">f_act_id,</if>
             <if test="fLineno != null">f_lineno,</if>
@@ -81,7 +80,6 @@
             <if test="fRemarks != null">f_remarks,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="fId != null">#{fId},</if>
             <if test="fPid != null">#{fPid},</if>
             <if test="fActId != null">#{fActId},</if>
             <if test="fLineno != null">#{fLineno},</if>

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

@@ -46,32 +46,32 @@
             left join sys_user u on ware.create_by = u.user_name
             left join sys_dept d on ware.f_deptid = d.dept_id
         <where>
-            <if test="fBillno != null  and fBillno != ''">and f_billno = #{fBillno}</if>
-            <if test="fCtrlcorpid != null ">and f_ctrlcorpid = #{fCtrlcorpid}</if>
-            <if test="fActId != null ">and f_act_id = #{fActId}</if>
-            <if test="fCorpid != null ">and f_corpid = #{fCorpid}</if>
-            <if test="fTransActId != null ">and f_trans_act_id = #{fTransActId}</if>
+            <if test="fBillno != null  and fBillno != ''">and ware.f_billno = #{fBillno}</if>
+            <if test="fCtrlcorpid != null ">and ware.f_ctrlcorpid = #{fCtrlcorpid}</if>
+            <if test="fActId != null ">and ware.f_act_id = #{fActId}</if>
+            <if test="fCorpid != null ">and ware.f_corpid = #{fCorpid}</if>
+            <if test="fTransActId != null ">and ware.f_trans_act_id = #{fTransActId}</if>
             <if test="tMblno != null  and tMblno != ''">and t_mblno = #{tMblno}</if>
-            <if test="fAmtdr != null ">and f_amtdr = #{fAmtdr}</if>
-            <if test="fAmtcr != null ">and f_amtcr = #{fAmtcr}</if>
-            <if test="fBilltype != null  and fBilltype != ''">and f_billtype = #{fBilltype}</if>
-            <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
-            <if test="fRemarks != null  and fRemarks != ''">and f_remarks = #{fRemarks}</if>
-            <if test="fFromDate != null ">and f_from_date = #{fFromDate}</if>
-            <if test="fAccbilldate != null ">and f_accbilldate = #{fAccbilldate}</if>
-            <if test="fToDate != null ">and f_to_date = #{fToDate}</if>
-            <if test="fRefNo != null  and fRefNo != ''">and f_ref_no = #{fRefNo}</if>
-            <if test="fDeptid != null ">and f_deptid = #{fDeptid}</if>
+            <if test="fAmtdr != null ">and ware.f_amtdr = #{fAmtdr}</if>
+            <if test="fAmtcr != null ">and ware.f_amtcr = #{fAmtcr}</if>
+            <if test="fBilltype != null  and fBilltype != ''">and ware.f_billtype = #{fBilltype}</if>
+            <if test="fBillstatus != null  and fBillstatus != ''">and ware.f_billstatus = #{fBillstatus}</if>
+            <if test="fRemarks != null  and fRemarks != ''">and ware.f_remarks = #{fRemarks}</if>
+            <if test="fFromDate != null ">and ware.f_from_date = #{fFromDate}</if>
+            <if test="fAccbilldate != null ">and ware.f_accbilldate = #{fAccbilldate}</if>
+            <if test="fToDate != null ">and ware.f_to_date = #{fToDate}</if>
+            <if test="fRefNo != null  and fRefNo != ''">and ware.f_ref_no = #{fRefNo}</if>
+            <if test="fDeptid != null ">and ware.f_deptid = #{fDeptid}</if>
             <if test='timeInterval != null and timeInterval[0] != null and timeInterval[0]!= ""'>
-                and f_accbilldate &gt;= #{timeInterval[0]}
+                and ware.f_accbilldate &gt;= #{timeInterval[0]}
             </if>
             <if test='timeInterval != null and timeInterval[1] != null and timeInterval[1]!= ""'>
-                and f_accbilldate &lt;= #{timeInterval[1]}
+                and ware.f_accbilldate &lt;= #{timeInterval[1]}
             </if>
-            <if test="chargingMethod != null ">and charging_method = #{chargingMethod}</if>
-            <if test="invoiceNo != null ">and invoice_no = #{invoiceNo}</if>
-            <if test="bank != null ">and bank = #{bank}</if>
-            <if test="waterBillNo != null ">and water_bill_no = #{waterBillNo}</if>
+            <if test="chargingMethod != null ">and ware.charging_method = #{chargingMethod}</if>
+            <if test="invoiceNo != null ">and ware.invoice_no = #{invoiceNo}</if>
+            <if test="bank != null ">and ware.bank = #{bank}</if>
+            <if test="waterBillNo != null ">and ware.water_bill_no = #{waterBillNo}</if>
         </where>
         ${params.dataScope}
     </select>
@@ -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
@@ -754,4 +767,117 @@
             w.f_mblno
         </where>
     </select>
+    <select id="selectFeeList" resultType="java.util.Map">
+        select
+        ware.create_by  AS createBy,
+        ware.f_billno AS fBillno,
+        ware.f_ctrlcorpid AS fCtrlcorpid,
+        ware.create_time AS createTime,
+        ware.f_accbilldate AS fAccbilldate,
+        ware.t_mblno AS tMblno,
+        dict.dict_label AS chargingMethod,
+        ware.invoice_no AS invoiceNo,
+        ware.bank AS bank,
+        ware.water_bill_no AS waterBillNo,
+        ware.f_amtdr AS fAmtdr,
+        ware.f_amtcr AS fAmtcr,
+        ware.f_remarks AS fRemarks,
+        CASE
+        WHEN  ware.f_billstatus = '1' THEN '保存'
+        WHEN  ware.f_billstatus = '2' THEN '暂存'
+        WHEN  ware.f_billstatus = '3' THEN '审批驳回'
+        WHEN  ware.f_billstatus = '4' THEN '提交审核'
+        WHEN  ware.f_billstatus = '5' THEN '审核中'
+        WHEN  ware.f_billstatus = '6' THEN '审核完成'
+        END
+        AS fBillstatus
+        from
+        t_fee ware
+        left join sys_user u on ware.create_by = u.user_name
+        left join sys_dept d on ware.f_deptid = d.dept_id
+        LEFT JOIN sys_dict_data dict ON dict.dict_value = ware.charging_method
+        <where>
+            dict.status = '0'
+            AND dict.dict_type = 'data_settlement_type'
+            <if test="fBillno != null  and fBillno != ''">and ware.f_billno = #{fBillno}</if>
+            <if test="fCtrlcorpid != null ">and ware.f_ctrlcorpid = #{fCtrlcorpid}</if>
+            <if test="fActId != null ">and ware.f_act_id = #{fActId}</if>
+            <if test="fCorpid != null ">and ware.f_corpid = #{fCorpid}</if>
+            <if test="fTransActId != null ">and ware.f_trans_act_id = #{fTransActId}</if>
+            <if test="tMblno != null  and tMblno != ''">and ware.t_mblno = #{tMblno}</if>
+            <if test="fAmtdr != null ">and ware.f_amtdr = #{fAmtdr}</if>
+            <if test="fAmtcr != null ">and ware.f_amtcr = #{fAmtcr}</if>
+            <if test="fBilltype != null  and fBilltype != ''">and ware.f_billtype = #{fBilltype}</if>
+            <if test="fBillstatus != null  and fBillstatus != ''">and ware.f_billstatus = #{fBillstatus}</if>
+            <if test="fRemarks != null  and fRemarks != ''">and ware.f_remarks = #{fRemarks}</if>
+            <if test="fFromDate != null ">and ware.f_from_date = #{fFromDate}</if>
+            <if test="fAccbilldate != null ">and ware.f_accbilldate = #{fAccbilldate}</if>
+            <if test="fToDate != null ">and ware.f_to_date = #{fToDate}</if>
+            <if test="fRefNo != null  and fRefNo != ''">and ware.f_ref_no = #{fRefNo}</if>
+            <if test="fDeptid != null ">and ware.f_deptid = #{fDeptid}</if>
+            <if test='timeInterval != null and timeInterval[0] != null and timeInterval[0]!= ""'>
+                and ware.f_accbilldate &gt;= #{timeInterval[0]}
+            </if>
+            <if test='timeInterval != null and timeInterval[1] != null and timeInterval[1]!= ""'>
+                and ware.f_accbilldate &lt;= #{timeInterval[1]}
+            </if>
+            <if test="chargingMethod != null ">and ware.charging_method = #{chargingMethod}</if>
+            <if test="invoiceNo != null ">and ware.invoice_no = #{invoiceNo}</if>
+            <if test="bank != null ">and ware.bank = #{bank}</if>
+            <if test="waterBillNo != null ">and ware.water_bill_no = #{waterBillNo}</if>
+        </where>
+        ${params.dataScope}
+    </select>
+    <select id="selectDetailedList" resultType="com.ruoyi.finance.excel.Detailed">
+        SELECT
+            ( @ii := @ii + 1 ) AS fId,
+            wi.f_mblno AS fMblno,
+            wi.f_bsdate AS fBsdate,
+            t.f_bscorpno AS fBscorpno,
+            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 'SJCK' THEN
+                    '出库'
+                WHEN 'HQZY' THEN
+                    '货转'
+                WHEN 'CKDB' THEN
+                    '调拨'
+                WHEN 'HWTG' THEN
+                    '货物通关'
+                WHEN 'KCZZ' THEN
+                    '库存总账'
+                END AS fBilltype,
+            wi.f_product_name AS fGoodsid,
+            wi.f_marks AS fMarks,
+            w.f_remarks AS fRemarks
+        FROM
+            t_fee_do w
+                LEFT JOIN t_warehousebillsfees wi ON w.f_srcid = wi.f_id
+                LEFT JOIN t_warehousebills t ON wi.f_pid = t.f_id
+                LEFT JOIN t_fees  f ON wi.f_feeid = f.f_id
+                LEFT JOIN sys_dict_data dict ON dict.dict_value = wi.f_feeUnitid
+           ,(
+            SELECT
+                @ii := 0
+        ) AS ii
+        WHERE
+            dict.status = '0'
+          AND dict.dict_type = 'data_unitfees'
+          AND w.f_pid = #{fId}
+    </select>
 </mapper>