[CODE]: 仓储业务导出功能 和列表显示字段保持一直

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

@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
+import com.ruoyi.warehouseBusiness.excel.StorageFee;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -70,11 +71,11 @@ public class TStorageFeeCalculationController extends BaseController {
     @Log(title = "详情主表", businessType = BusinessType.EXPORT)
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
-    public AjaxResult export(TWarehouseBills tWarehouseBills) {
+    public AjaxResult export(TWarehouseBills tWarehouseBills) throws Exception {
         tWarehouseBills.setfBilltype("JSCCF");
-        List<TWarehouseBills> list = itWarehouseBillsService.selectTWarehousebillsList(tWarehouseBills);
-        ExcelUtil<TWarehouseBills> util = new ExcelUtil<TWarehouseBills>(TWarehouseBills.class);
-        return util.exportExcel(list, "warehousebills");
+        List<StorageFee> list = itWarehouseBillsService.storageFeeExport(tWarehouseBills);
+        ExcelUtil<StorageFee> util = new ExcelUtil<StorageFee>(StorageFee.class);
+        return util.exportExcel(list, "仓储费计算");
     }
 
     /**

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

@@ -14,6 +14,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
+import com.ruoyi.warehouseBusiness.excel.GoodsTransfer;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -56,7 +57,6 @@ public class TWarehouseGoodsTransferController extends BaseController {
         return itWarehouseBillsService.getWarehouseInStockBillsNo(tWarehouseBills);
     }
 
-
     /**
      * 导出货转详情主表列表
      */
@@ -65,10 +65,11 @@ public class TWarehouseGoodsTransferController extends BaseController {
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
     @RepeatSubmit
-    public AjaxResult export(TWarehouseBills tWarehouseBills) {
-        List<TWarehouseBills> list = itWarehouseBillsService.selectTWarehousebillsList(tWarehouseBills);
-        ExcelUtil<TWarehouseBills> util = new ExcelUtil<TWarehouseBills>(TWarehouseBills.class);
-        return util.exportExcel(list, "warehousebills");
+    public AjaxResult export(TWarehouseBills tWarehouseBills) throws Exception {
+        tWarehouseBills.setfBilltype("HQZY");
+        List<GoodsTransfer> list = itWarehouseBillsService.goodsTransferExport(tWarehouseBills);
+        ExcelUtil<GoodsTransfer> util = new ExcelUtil<GoodsTransfer>(GoodsTransfer.class);
+        return util.exportExcel(list, "货转");
     }
 
     /**

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

@@ -14,6 +14,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
+import com.ruoyi.warehouseBusiness.excel.InStock;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -64,11 +65,11 @@ public class TWarehouseInStockController extends BaseController {
     @Log(title = "详情主表", businessType = BusinessType.EXPORT)
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
-    public AjaxResult export(TWarehouseBills tWarehouseBills) {
+    public AjaxResult export(TWarehouseBills tWarehouseBills) throws Exception {
         tWarehouseBills.setfBilltype("SJRK");
-        List<TWarehouseBills> list = itWarehouseBillsService.selectTWarehousebillsList(tWarehouseBills);
-        ExcelUtil<TWarehouseBills> util = new ExcelUtil<TWarehouseBills>(TWarehouseBills.class);
-        return util.exportExcel(list, "warehousebills");
+        List<InStock> list = itWarehouseBillsService.inStockExport(tWarehouseBills);
+        ExcelUtil<InStock> util = new ExcelUtil<InStock>(InStock.class);
+        return util.exportExcel(list, "入库");
     }
 
     /**

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

@@ -14,6 +14,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
+import com.ruoyi.warehouseBusiness.excel.OutStock;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -89,11 +90,11 @@ public class TWarehouseOutStockController extends BaseController {
     @Log(title = "详情主表", businessType = BusinessType.EXPORT)
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
-    public AjaxResult export(TWarehouseBills tWarehouseBills) {
+    public AjaxResult export(TWarehouseBills tWarehouseBills)throws Exception  {
         tWarehouseBills.setfBilltype("SJCK");
-        List<TWarehouseBills> list = itWarehouseBillsService.selectTWarehousebillsList(tWarehouseBills);
-        ExcelUtil<TWarehouseBills> util = new ExcelUtil<TWarehouseBills>(TWarehouseBills.class);
-        return util.exportExcel(list, "warehousebills");
+        List<OutStock> list = itWarehouseBillsService.outStockExport(tWarehouseBills);
+        ExcelUtil<OutStock> util = new ExcelUtil<>(OutStock.class);
+        return util.exportExcel(list, "出库");
     }
 
     /**

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

@@ -14,6 +14,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
+import com.ruoyi.warehouseBusiness.excel.StockTransfer;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -68,15 +69,18 @@ public class TWarehouseStockTransferController extends BaseController {
     @Log(title = "详情主表", businessType = BusinessType.EXPORT)
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
-    public AjaxResult export(TWarehouseBills tWarehouseBills) {
+    public AjaxResult export(TWarehouseBills tWarehouseBills) throws Exception {
+        String exportName =null;
         if(tWarehouseBills.getType().equals("1")){
             tWarehouseBills.setfBilltype("CKDB");
+            exportName="调拨";
         }else{
             tWarehouseBills.setfBilltype("HWTG");
+            exportName="货物通关";
         }
-        List<TWarehouseBills> list = itWarehouseBillsService.selectTWarehousebillsList(tWarehouseBills);
-        ExcelUtil<TWarehouseBills> util = new ExcelUtil<TWarehouseBills>(TWarehouseBills.class);
-        return util.exportExcel(list, "warehousebills");
+        List<StockTransfer> list = itWarehouseBillsService.stockTransferExport(tWarehouseBills);
+        ExcelUtil<StockTransfer> util = new ExcelUtil<>(StockTransfer.class);
+        return util.exportExcel(list, exportName);
     }
 
     /**

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/GoodsTransfer.java

@@ -0,0 +1,214 @@
+package com.ruoyi.warehouseBusiness.excel;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 入库导出
+ *
+ * @author ruoyi
+ * @date 2020-12-11
+ */
+public class GoodsTransfer {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 创建者
+     */
+    @Excel(name = "制单人")
+    private String createBy;
+
+    /**
+     *  库存明细 1 未入账  2 未完成所有入账  6  已入账
+     */
+    @Excel(name = "货转状态")
+    private String fItemsStatus;
+
+    /**
+     * 客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name
+     */
+    @Excel(name = "货权方")
+    private String fCorpid;
+
+    /**
+     * 客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name
+     */
+    @Excel(name = "转货权方")
+    private String fTocorpid;
+
+
+    /** 明细品名合计 */
+    @Excel(name = "品名")
+    private String fProductName;
+
+    /**
+     * 唛头
+     */
+    @Excel(name = "品牌")
+    private String fMarks;
+
+    /**
+     * 唛头
+     */
+    @Excel(name = "业务编号")
+    private String fBillno;
+
+    /**
+     * 入库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "货转日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBsdate;
+
+    /**
+     * 仓库
+     */
+    @Excel(name = "贸易方式")
+    private String fTrademodeid;
+
+    /**
+     * 仓库
+     */
+    @Excel(name = "仓库")
+    private String fWarehouseid;
+
+    /**
+     * 件数,由明细表自动合计生成
+     */
+    @Excel(name = "件数")
+    private Integer fQty;
+
+    /**
+     * 毛重，由明细表自动合计生成
+     */
+    @Excel(name = "毛重（KG）")
+    private Float fGrossweight;
+
+    /**
+     * 净重，由明细表自动合计生成
+     */
+    @Excel(name = "净重（KG）")
+    private Float fNetweight;
+
+
+    /**
+     * 状态(数据字典),N 入（出）库中，T入（出）库完成，状态为完成不能删除，状态变化，用邮件、微信通知客户。
+     */
+    @Excel(name = "费用状态")
+    private String fBillstatus;
+
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getfItemsStatus() {
+        return fItemsStatus;
+    }
+
+    public void setfItemsStatus(String fItemsStatus) {
+        this.fItemsStatus = fItemsStatus;
+    }
+
+    public String getfCorpid() {
+        return fCorpid;
+    }
+
+    public void setfCorpid(String fCorpid) {
+        this.fCorpid = fCorpid;
+    }
+
+    public String getfTocorpid() {
+        return fTocorpid;
+    }
+
+    public void setfTocorpid(String fTocorpid) {
+        this.fTocorpid = fTocorpid;
+    }
+
+    public String getfProductName() {
+        return fProductName;
+    }
+
+    public void setfProductName(String fProductName) {
+        this.fProductName = fProductName;
+    }
+
+    public String getfMarks() {
+        return fMarks;
+    }
+
+    public void setfMarks(String fMarks) {
+        this.fMarks = fMarks;
+    }
+
+    public String getfBillno() {
+        return fBillno;
+    }
+
+    public void setfBillno(String fBillno) {
+        this.fBillno = fBillno;
+    }
+
+    public Date getfBsdate() {
+        return fBsdate;
+    }
+
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
+    }
+
+    public String getfWarehouseid() {
+        return fWarehouseid;
+    }
+
+    public void setfWarehouseid(String fWarehouseid) {
+        this.fWarehouseid = fWarehouseid;
+    }
+
+    public Integer getfQty() {
+        return fQty;
+    }
+
+    public void setfQty(Integer fQty) {
+        this.fQty = fQty;
+    }
+
+    public Float getfGrossweight() {
+        return fGrossweight;
+    }
+
+    public void setfGrossweight(Float fGrossweight) {
+        this.fGrossweight = fGrossweight;
+    }
+
+    public Float getfNetweight() {
+        return fNetweight;
+    }
+
+    public void setfNetweight(Float fNetweight) {
+        this.fNetweight = fNetweight;
+    }
+
+    public String getfBillstatus() {
+        return fBillstatus;
+    }
+
+    public void setfBillstatus(String fBillstatus) {
+        this.fBillstatus = fBillstatus;
+    }
+
+    public String getfTrademodeid() {
+        return fTrademodeid;
+    }
+
+    public void setfTrademodeid(String fTrademodeid) {
+        this.fTrademodeid = fTrademodeid;
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/InStock.java

@@ -0,0 +1,260 @@
+package com.ruoyi.warehouseBusiness.excel;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 入库导出
+ *
+ * @author ruoyi
+ * @date 2020-12-11
+ */
+public class InStock  {
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 创建者
+     */
+    @Excel(name = "制单人")
+    private String createBy;
+
+    /**
+     *  库存明细 1 未入账  2 未完成所有入账  6  已入账
+     */
+    @Excel(name = "入库状态")
+    private String fItemsStatus;
+
+    /**
+     * 客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name
+     */
+    @Excel(name = "货权方")
+    private String fCorpid;
+
+    /**
+     * 提单号
+     */
+    @Excel(name = "提单号")
+    private String fMblno;
+
+    /** 明细品名合计 */
+    @Excel(name = "品名")
+    private String fProductName;
+
+    /**
+     * 唛头
+     */
+    @Excel(name = "品牌")
+    private String fMarks;
+
+    /**
+     * 入（出）库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBsdate;
+
+    /**
+     * 仓库
+     */
+    @Excel(name = "仓库")
+    private String fWarehouseid;
+
+    /**
+     * 计划件数,由明细表自动合计生成
+     */
+    @Excel(name = "计划件数")
+    private Integer fPlanqty;
+
+    /**
+     * 件数,由明细表自动合计生成
+     */
+    @Excel(name = "入库件数")
+    private Integer fQty;
+
+    /**
+     * 毛重，由明细表自动合计生成
+     */
+    @Excel(name = "入库毛重（KG）")
+    private Float fGrossweight;
+
+    /**
+     * 净重，由明细表自动合计生成
+     */
+    @Excel(name = "入库净重（KG）")
+    private Float fNetweight;
+
+    /** 业务类型(存汉字的，用来区别 如: 来车提货,出库装箱  区别) */
+    @Excel(name = "业务类别")
+    private String fBusinessType;
+
+    /**
+     * 状态(数据字典),N 入（出）库中，T入（出）库完成，状态为完成不能删除，状态变化，用邮件、微信通知客户。
+     */
+    @Excel(name = "费用状态")
+    private String fBillstatus;
+
+    /** 车号 */
+    @Excel(name = "车号")
+    private String fTruckno;
+
+    /** 司机名 */
+    @Excel(name = "司机名称")
+    private String fDriverName;
+
+    /** 司机电话 */
+    @Excel(name = "司机电话")
+    private String fDriverTel;
+
+    /** 司机身份证 */
+    @Excel(name = "司机身份证")
+    private String fDriverIdCar;
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getfCorpid() {
+        return fCorpid;
+    }
+
+    public void setfCorpid(String fCorpid) {
+        this.fCorpid = fCorpid;
+    }
+
+    public String getfMblno() {
+        return fMblno;
+    }
+
+    public void setfMblno(String fMblno) {
+        this.fMblno = fMblno;
+    }
+
+    public String getfProductName() {
+        return fProductName;
+    }
+
+    public void setfProductName(String fProductName) {
+        this.fProductName = fProductName;
+    }
+
+    public String getfMarks() {
+        return fMarks;
+    }
+
+    public void setfMarks(String fMarks) {
+        this.fMarks = fMarks;
+    }
+
+    public String getfBillstatus() {
+        return fBillstatus;
+    }
+
+    public void setfBillstatus(String fBillstatus) {
+        this.fBillstatus = fBillstatus;
+    }
+
+    public String getfTruckno() {
+        return fTruckno;
+    }
+
+    public void setfTruckno(String fTruckno) {
+        this.fTruckno = fTruckno;
+    }
+
+    public String getfDriverName() {
+        return fDriverName;
+    }
+
+    public void setfDriverName(String fDriverName) {
+        this.fDriverName = fDriverName;
+    }
+
+    public String getfDriverTel() {
+        return fDriverTel;
+    }
+
+    public void setfDriverTel(String fDriverTel) {
+        this.fDriverTel = fDriverTel;
+    }
+
+    public String getfDriverIdCar() {
+        return fDriverIdCar;
+    }
+
+    public void setfDriverIdCar(String fDriverIdCar) {
+        this.fDriverIdCar = fDriverIdCar;
+    }
+
+    public String getfBusinessType() {
+        return fBusinessType;
+    }
+
+    public void setfBusinessType(String fBusinessType) {
+        this.fBusinessType = fBusinessType;
+    }
+
+
+
+    public String getfItemsStatus() {
+        return fItemsStatus;
+    }
+
+    public void setfItemsStatus(String fItemsStatus) {
+        this.fItemsStatus = fItemsStatus;
+    }
+
+    public Date getfBsdate() {
+        return fBsdate;
+    }
+
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
+    }
+
+    public String getfWarehouseid() {
+        return fWarehouseid;
+    }
+
+    public void setfWarehouseid(String fWarehouseid) {
+        this.fWarehouseid = fWarehouseid;
+    }
+
+    public Integer getfPlanqty() {
+        return fPlanqty;
+    }
+
+    public void setfPlanqty(Integer fPlanqty) {
+        this.fPlanqty = fPlanqty;
+    }
+
+    public Integer getfQty() {
+        return fQty;
+    }
+
+    public void setfQty(Integer fQty) {
+        this.fQty = fQty;
+    }
+
+    public Float getfGrossweight() {
+        return fGrossweight;
+    }
+
+    public void setfGrossweight(Float fGrossweight) {
+        this.fGrossweight = fGrossweight;
+    }
+
+    public Float getfNetweight() {
+        return fNetweight;
+    }
+
+    public void setfNetweight(Float fNetweight) {
+        this.fNetweight = fNetweight;
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/ListMapToBeanUtils.java

@@ -0,0 +1,39 @@
+package com.ruoyi.warehouseBusiness.excel;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class ListMapToBeanUtils {
+    /**
+     * List<Map<String, Object>>转List<T>
+     */
+    public static <T> List<T> castMapToBean(List<Map<String, Object>> list, Class<T> clazz) throws Exception {
+        if (list == null || list.size()==0) {
+            return null;
+        }
+        List<T> tList = new ArrayList<T>();
+        // 获取类中声明的所有字段
+        Field[] fields = clazz.getDeclaredFields();
+
+        T t;
+        for (Map<String, Object> map : list) {
+            // 每次都先初始化一遍,然后再设置值
+            t = clazz.newInstance();
+            for (Field field : fields) {
+                // 把序列化的字段去除掉
+                if (!"serialVersionUID".equals(field.getName())) {
+                    // 由于Field都是私有属性，所有需要允许修改
+                    field.setAccessible(true);
+
+                    // 设置值, 类型要和vo中的属性名称对应好,不然会报类型转换错误
+                    field.set(t, map.get(field.getName()));
+                }
+            }
+            tList.add(t); // 把转换好的数据添加到集合中
+        }
+        return tList;
+    }
+
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/OutStock.java

@@ -0,0 +1,293 @@
+package com.ruoyi.warehouseBusiness.excel;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 入库导出
+ *
+ * @author ruoyi
+ * @date 2020-12-11
+ */
+public class OutStock  {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 创建者
+     */
+    @Excel(name = "制单人")
+    private String createBy;
+
+    /**
+     * 仓管人
+     */
+    @Excel(name = "仓管员")
+    private String fStorekeeper;
+
+    /**
+     *  库存明细 1 未入账  2 未完成所有入账  6  已入账
+     */
+    @Excel(name = "出库状态")
+    private String fItemsStatus;
+
+    /**
+     * 客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name
+     */
+    @Excel(name = "货权方")
+    private String fCorpid;
+
+    /**
+     * 提单号
+     */
+    @Excel(name = "提单号")
+    private String fMblno;
+
+    /** 明细品名合计 */
+    @Excel(name = "品名")
+    private String fProductName;
+
+    /**
+     * 唛头
+     */
+    @Excel(name = "品牌")
+    private String fMarks;
+
+    /**
+     * 入库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出库日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBsdate;
+
+    /**
+     * 仓库
+     */
+    @Excel(name = "仓库")
+    private String fWarehouseid;
+
+    /**
+     * 计划件数,由明细表自动合计生成
+     */
+    @Excel(name = "计划件数")
+    private Long fPlanqty;
+
+    /**
+     * 件数,由明细表自动合计生成
+     */
+    @Excel(name = "出库件数")
+    private Integer fQty;
+
+    /**
+     * 毛重，由明细表自动合计生成
+     */
+    @Excel(name = "出库毛重（KG）")
+    private Float fGrossweight;
+
+    /**
+     * 净重，由明细表自动合计生成
+     */
+    @Excel(name = "出库净重（KG）")
+    private Float fNetweight;
+
+    /** 车号 */
+    @Excel(name = "车号")
+    private String fTruckno;
+
+    /** 司机名 */
+    @Excel(name = "司机名称")
+    private String fDriverName;
+
+    /** 司机电话 */
+    @Excel(name = "司机电话")
+    private String fDriverTel;
+
+    /** 司机身份证 */
+    @Excel(name = "司机身份证")
+    private String fDriverIdCar;
+
+    /** 业务类型(存汉字的，用来区别 如: 来车提货,出库装箱  区别) */
+    @Excel(name = "业务类别")
+    private String fBusinessType;
+
+    /**
+     * 状态(数据字典),N 入（出）库中，T入（出）库完成，状态为完成不能删除，状态变化，用邮件、微信通知客户。
+     */
+    @Excel(name = "费用状态")
+    private String fBillstatus;
+
+    
+    public String getCreateBy() {
+        return createBy;
+    }
+
+   
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getfStorekeeper() {
+        return fStorekeeper;
+    }
+
+    public void setfStorekeeper(String fStorekeeper) {
+        this.fStorekeeper = fStorekeeper;
+    }
+
+    
+    public String getfCorpid() {
+        return fCorpid;
+    }
+
+    
+    public void setfCorpid(String fCorpid) {
+        this.fCorpid = fCorpid;
+    }
+
+    
+    public String getfMblno() {
+        return fMblno;
+    }
+
+    
+    public void setfMblno(String fMblno) {
+        this.fMblno = fMblno;
+    }
+
+    
+    public String getfProductName() {
+        return fProductName;
+    }
+
+    
+    public void setfProductName(String fProductName) {
+        this.fProductName = fProductName;
+    }
+
+    
+    public String getfMarks() {
+        return fMarks;
+    }
+
+    
+    public void setfMarks(String fMarks) {
+        this.fMarks = fMarks;
+    }
+
+    
+    public String getfTruckno() {
+        return fTruckno;
+    }
+
+    
+    public void setfTruckno(String fTruckno) {
+        this.fTruckno = fTruckno;
+    }
+
+    
+    public String getfDriverName() {
+        return fDriverName;
+    }
+
+    
+    public void setfDriverName(String fDriverName) {
+        this.fDriverName = fDriverName;
+    }
+
+    
+    public String getfDriverTel() {
+        return fDriverTel;
+    }
+
+    
+    public void setfDriverTel(String fDriverTel) {
+        this.fDriverTel = fDriverTel;
+    }
+
+    
+    public String getfDriverIdCar() {
+        return fDriverIdCar;
+    }
+
+    
+    public void setfDriverIdCar(String fDriverIdCar) {
+        this.fDriverIdCar = fDriverIdCar;
+    }
+
+    
+    public String getfBusinessType() {
+        return fBusinessType;
+    }
+
+    
+    public void setfBusinessType(String fBusinessType) {
+        this.fBusinessType = fBusinessType;
+    }
+
+    
+    public String getfBillstatus() {
+        return fBillstatus;
+    }
+
+    
+    public void setfBillstatus(String fBillstatus) {
+        this.fBillstatus = fBillstatus;
+    }
+
+    public String getfItemsStatus() {
+        return fItemsStatus;
+    }
+
+    public void setfItemsStatus(String fItemsStatus) {
+        this.fItemsStatus = fItemsStatus;
+    }
+
+    public Date getfBsdate() {
+        return fBsdate;
+    }
+
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
+    }
+
+    public String getfWarehouseid() {
+        return fWarehouseid;
+    }
+
+    public void setfWarehouseid(String fWarehouseid) {
+        this.fWarehouseid = fWarehouseid;
+    }
+
+    public Long getfPlanqty() {
+        return fPlanqty;
+    }
+
+    public void setfPlanqty(Long fPlanqty) {
+        this.fPlanqty = fPlanqty;
+    }
+
+    public Integer getfQty() {
+        return fQty;
+    }
+
+    public void setfQty(Integer fQty) {
+        this.fQty = fQty;
+    }
+
+    public Float getfGrossweight() {
+        return fGrossweight;
+    }
+
+    public void setfGrossweight(Float fGrossweight) {
+        this.fGrossweight = fGrossweight;
+    }
+
+    public Float getfNetweight() {
+        return fNetweight;
+    }
+
+    public void setfNetweight(Float fNetweight) {
+        this.fNetweight = fNetweight;
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/StockTransfer.java

@@ -0,0 +1,251 @@
+package com.ruoyi.warehouseBusiness.excel;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 入库导出
+ *
+ * @author ruoyi
+ * @date 2020-12-11
+ */
+public class StockTransfer {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 创建者
+     */
+    @Excel(name = "制单人")
+    private String createBy;
+
+    /**
+     * 仓管人
+     */
+    @Excel(name = "仓管员")
+    private String fStorekeeper;
+
+    /**
+     *  库存明细 1 未入账  2 未完成所有入账  6  已入账
+     */
+    @Excel(name = "调拨状态")
+    private String fItemsStatus;
+
+    /**
+     * 客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name
+     */
+    @Excel(name = "货权方")
+    private String fCorpid;
+
+    /**
+     * 提单号
+     */
+    @Excel(name = "提单号")
+    private String fMblno;
+
+    /** 明细品名合计 */
+    @Excel(name = "品名")
+    private String fProductName;
+
+    /**
+     * 唛头
+     */
+    @Excel(name = "品牌")
+    private String fMarks;
+
+    /**
+     * 入库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "调拨日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBsdate;
+
+    /**
+     * 仓库
+     */
+    @Excel(name = "调入仓库")
+    private String fWarehouseid;
+
+    /**
+     * 仓库
+     */
+    @Excel(name = "调出仓库")
+    private String fInwarehouseid;
+
+    /**
+     * 计划件数,由明细表自动合计生成
+     */
+    @Excel(name = "计划调拨件数")
+    private Long fPlanqty;
+
+    /**
+     * 件数,由明细表自动合计生成
+     */
+    @Excel(name = "调拨件数")
+    private Integer fQty;
+
+    /**
+     * 毛重，由明细表自动合计生成
+     */
+    @Excel(name = "调拨毛重（KG）")
+    private Float fGrossweight;
+
+    /**
+     * 净重，由明细表自动合计生成
+     */
+    @Excel(name = "调拨净重（KG）")
+    private Float fNetweight;
+
+
+    /** 业务类型(存汉字的，用来区别 如: 来车提货,出库装箱  区别) */
+    @Excel(name = "业务类别")
+    private String fBusinessType;
+
+    /**
+     * 状态(数据字典),N 入（出）库中，T入（出）库完成，状态为完成不能删除，状态变化，用邮件、微信通知客户。
+     */
+    @Excel(name = "费用状态")
+    private String fBillstatus;
+
+    
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getfStorekeeper() {
+        return fStorekeeper;
+    }
+
+    public void setfStorekeeper(String fStorekeeper) {
+        this.fStorekeeper = fStorekeeper;
+    }
+
+    
+    public String getfCorpid() {
+        return fCorpid;
+    }
+
+    
+    public void setfCorpid(String fCorpid) {
+        this.fCorpid = fCorpid;
+    }
+
+    
+    public String getfMblno() {
+        return fMblno;
+    }
+
+    
+    public void setfMblno(String fMblno) {
+        this.fMblno = fMblno;
+    }
+
+    
+    public String getfProductName() {
+        return fProductName;
+    }
+
+    
+    public void setfProductName(String fProductName) {
+        this.fProductName = fProductName;
+    }
+
+    
+    public String getfMarks() {
+        return fMarks;
+    }
+
+    
+    public void setfMarks(String fMarks) {
+        this.fMarks = fMarks;
+    }
+
+    
+    public String getfBusinessType() {
+        return fBusinessType;
+    }
+
+    
+    public void setfBusinessType(String fBusinessType) {
+        this.fBusinessType = fBusinessType;
+    }
+
+    
+    public String getfBillstatus() {
+        return fBillstatus;
+    }
+
+    
+    public void setfBillstatus(String fBillstatus) {
+        this.fBillstatus = fBillstatus;
+    }
+
+    public String getfItemsStatus() {
+        return fItemsStatus;
+    }
+
+    public void setfItemsStatus(String fItemsStatus) {
+        this.fItemsStatus = fItemsStatus;
+    }
+
+    public Date getfBsdate() {
+        return fBsdate;
+    }
+
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
+    }
+
+    public String getfWarehouseid() {
+        return fWarehouseid;
+    }
+
+    public void setfWarehouseid(String fWarehouseid) {
+        this.fWarehouseid = fWarehouseid;
+    }
+
+    public Long getfPlanqty() {
+        return fPlanqty;
+    }
+
+    public void setfPlanqty(Long fPlanqty) {
+        this.fPlanqty = fPlanqty;
+    }
+
+    public Integer getfQty() {
+        return fQty;
+    }
+
+    public void setfQty(Integer fQty) {
+        this.fQty = fQty;
+    }
+
+    public Float getfGrossweight() {
+        return fGrossweight;
+    }
+
+    public void setfGrossweight(Float fGrossweight) {
+        this.fGrossweight = fGrossweight;
+    }
+
+    public Float getfNetweight() {
+        return fNetweight;
+    }
+
+    public void setfNetweight(Float fNetweight) {
+        this.fNetweight = fNetweight;
+    }
+
+    public String getfInwarehouseid() {
+        return fInwarehouseid;
+    }
+
+    public void setfInwarehouseid(String fInwarehouseid) {
+        this.fInwarehouseid = fInwarehouseid;
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/StorageFee.java

@@ -0,0 +1,118 @@
+package com.ruoyi.warehouseBusiness.excel;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 入库导出
+ *
+ * @author ruoyi
+ * @date 2020-12-11
+ */
+public class StorageFee {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唛头
+     */
+    @Excel(name = "单据编号")
+    private String fBillno;
+
+    /**
+     * 客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name
+     */
+    @Excel(name = "客户名称")
+    private String fCorpid;
+
+    /**
+     * 入库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计费日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBillingDeadline;
+
+
+    /**
+     * 状态(数据字典),N 入（出）库中，T入（出）库完成，状态为完成不能删除，状态变化，用邮件、微信通知客户。
+     */
+    @Excel(name = "单据状态")
+    private String fBillstatus;
+
+    /**
+     * 创建者
+     */
+    @Excel(name = "制单人")
+    private String createBy;
+
+    /**
+     * 入库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createTime;
+
+
+    /**
+     * 创建者
+     */
+    @Excel(name = "备注")
+    private String remark;
+
+    public String getfBillno() {
+        return fBillno;
+    }
+
+    public void setfBillno(String fBillno) {
+        this.fBillno = fBillno;
+    }
+
+    public String getfCorpid() {
+        return fCorpid;
+    }
+
+    public void setfCorpid(String fCorpid) {
+        this.fCorpid = fCorpid;
+    }
+
+    public Date getfBillingDeadline() {
+        return fBillingDeadline;
+    }
+
+    public void setfBillingDeadline(Date fBillingDeadline) {
+        this.fBillingDeadline = fBillingDeadline;
+    }
+
+    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 Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -6,6 +6,7 @@ import com.ruoyi.reportManagement.domain.TWareHouseItemsExcel;
 import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
+import com.ruoyi.warehouseBusiness.excel.*;
 
 import java.util.List;
 import java.util.Map;
@@ -199,4 +200,14 @@ public interface ITWarehouseBillsService {
 
     AjaxResult addCreditItems(String tEnclosure , String  tWarehousebillsitems, String billsType, LoginUser loginUser);
 
+    public List<InStock> inStockExport(TWarehouseBills tWarehousebills) throws Exception;
+
+    public List<OutStock> outStockExport(TWarehouseBills tWarehousebills) throws Exception;
+
+    public List<StockTransfer> stockTransferExport(TWarehouseBills tWarehousebills) throws Exception;
+
+    public List<GoodsTransfer> goodsTransferExport(TWarehouseBills tWarehousebills) throws Exception;
+
+    public List<StorageFee> storageFeeExport(TWarehouseBills tWarehousebills) throws Exception;
+
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -28,6 +28,7 @@ import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysDictDataMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.warehouseBusiness.domain.*;
+import com.ruoyi.warehouseBusiness.excel.*;
 import com.ruoyi.warehouseBusiness.mapper.*;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -279,7 +280,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      */
     @Override
     public List<Map<String, Object>> selectWarehouseBusinessList(TWarehouseBills tWarehousebills) {
-        if(tWarehousebills.getfBilltype().equals("JSCCF") |  tWarehousebills.getfBilltype().equals("HQZY") | tWarehousebills.getfBilltype().equals("HWTG")){
+        if(tWarehousebills.getfBilltype().equals("JSCCF") |  tWarehousebills.getfBilltype().equals("HQZY")){
             return tWarehouseBillsMapper.selectWarehouseBusinessList1(tWarehousebills);
         }else {
             return tWarehouseBillsMapper.selectWarehouseBusinessList(tWarehousebills);
@@ -1017,6 +1018,41 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return AjaxResult.success();
     }
 
+    @Override
+    public List<InStock> inStockExport(TWarehouseBills tWarehousebills) throws Exception {
+        List<Map<String, Object>> list = tWarehouseBillsMapper.selectWarehouseBusinessList(tWarehousebills);
+        List<InStock> list1 = ListMapToBeanUtils.castMapToBean(list,InStock.class);
+        return list1;
+    }
+
+    @Override
+    public List<OutStock> outStockExport(TWarehouseBills tWarehousebills) throws Exception {
+        List<Map<String, Object>> list = tWarehouseBillsMapper.selectWarehouseBusinessList(tWarehousebills);
+        List<OutStock> list1 = ListMapToBeanUtils.castMapToBean(list,OutStock.class);
+        return list1;
+    }
+
+    @Override
+    public List<StockTransfer> stockTransferExport(TWarehouseBills tWarehousebills) throws Exception {
+        List<Map<String, Object>> list = tWarehouseBillsMapper.selectWarehouseBusinessList(tWarehousebills);
+        List<StockTransfer> list1 = ListMapToBeanUtils.castMapToBean(list,StockTransfer.class);
+        return list1;
+    }
+
+    @Override
+    public List<GoodsTransfer> goodsTransferExport(TWarehouseBills tWarehousebills) throws Exception {
+        List<Map<String, Object>> list = tWarehouseBillsMapper.selectWarehouseBusinessList1(tWarehousebills);
+        List<GoodsTransfer> list1 = ListMapToBeanUtils.castMapToBean(list,GoodsTransfer.class);
+        return list1;
+    }
+
+    @Override
+    public List<StorageFee> storageFeeExport(TWarehouseBills tWarehousebills) throws Exception {
+        List<Map<String, Object>> list = tWarehouseBillsMapper.selectWarehouseBusinessList1(tWarehousebills);
+        List<StorageFee> list1 = ListMapToBeanUtils.castMapToBean(list,StorageFee.class);
+        return list1;
+    }
+
 
     /**
      * 根据仓库主表id 更新对应明细表状态