完善对接仓储业务导出接口，完善调拨提单请核接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/TCntrController.java

@@ -58,7 +58,7 @@ public class TCntrController extends BaseController
     {
         List<TCntr> list = tCntrService.selectTCntrList(tCntr);
         ExcelUtil<TCntr> util = new ExcelUtil<TCntr>(TCntr.class);
-        return util.exportExcel(list, "cntr");
+        return util.exportExcel(list, "集装箱");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/basicData/RouteController.java

@@ -60,7 +60,7 @@ public class RouteController extends BaseController
     {
         List<TAddress> list = tAddressService.selectTAddressList(tAddress);
         ExcelUtil<TAddress> util = new ExcelUtil<TAddress>(TAddress.class);
-        return util.exportExcel(list, "address");
+        return util.exportExcel(list, "route");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/agreement/TWarehouseAgreementStorageController.java

@@ -51,9 +51,10 @@ public class TWarehouseAgreementStorageController extends BaseController {
     @Log(title = "仓储费", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TWarehouseAgreement tWarehouseAgreement) {
+        tWarehouseAgreement.setfFeetypeid(0L);
         List<TWarehouseAgreement> list = tWarehouseAgreementService.selectTWarehouseAgreementList(tWarehouseAgreement);
         ExcelUtil<TWarehouseAgreement> util = new ExcelUtil<TWarehouseAgreement>(TWarehouseAgreement.class);
-        return util.exportExcel(list, "agreement");
+        return util.exportExcel(list, "仓储费协议");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/agreement/TWarehouseAgreementTaskController.java

@@ -51,9 +51,10 @@ public class TWarehouseAgreementTaskController extends BaseController {
     @Log(title = "仓储费", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TWarehouseAgreement tWarehouseAgreement) {
+        tWarehouseAgreement.setfFeetypeid((long) 1);
         List<TWarehouseAgreement> list = tWarehouseAgreementService.selectTWarehouseAgreementList(tWarehouseAgreement);
         ExcelUtil<TWarehouseAgreement> util = new ExcelUtil<TWarehouseAgreement>(TWarehouseAgreement.class);
-        return util.exportExcel(list, "agreement");
+        return util.exportExcel(list, "作业费协议");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TCorpsController.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -67,7 +68,7 @@ public class TCorpsController extends BaseController {
     public AjaxResult export(TCorps tCorps) {
         List<TCorps> list = tCorpsService.selectTCorpsList(tCorps);
         ExcelUtil<TCorps> util = new ExcelUtil<TCorps>(TCorps.class);
-        return util.exportExcel(list, "corps");
+        return util.exportExcel(list, "客户信息");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TFeesController.java

@@ -49,7 +49,7 @@ public class TFeesController extends BaseController {
     public AjaxResult export(TFees tFees) {
         List<TFees> list = tFeesService.selectTFeesList(tFees);
         ExcelUtil<TFees> util = new ExcelUtil<TFees>(TFees.class);
-        return util.exportExcel(list, "fees");
+        return util.exportExcel(list, "费用信息");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TGoodsController.java

@@ -48,7 +48,7 @@ public class TGoodsController extends BaseController {
     public AjaxResult export(TGoods tGoods) {
         List<TGoods> list = tGoodsService.selectTGoodsList(tGoods);
         ExcelUtil<TGoods> util = new ExcelUtil<TGoods>(TGoods.class);
-        return util.exportExcel(list, "goods");
+        return util.exportExcel(list, "商品信息");
     }
 
     /**

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

@@ -66,7 +66,7 @@ public class TInvoiceController extends BaseController {
         }
         List<Charge> list = tFeeService.chargeExport(tFee);
         ExcelUtil<Charge> util = new ExcelUtil<Charge>(Charge.class);
-        return util.exportExcel(list, FeesTypeEnum.INVOICE.getName());
+        return util.exportExcel(list, "开票");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/quotation/TSeapriceController.java

@@ -101,7 +101,7 @@ public class TSeapriceController extends BaseController
     {
         List<TSeaprice> list = tSeapriceService.selectTSeapriceList(tSeaprice);
         ExcelUtil<TSeaprice> util = new ExcelUtil<TSeaprice>(TSeaprice.class);
-        return util.exportExcel(list, "seaprice");
+        return util.exportExcel(list, "运价管理");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/reportManagement/TWarehousebillsitemsSummaryController.java

@@ -70,9 +70,15 @@ public class TWarehousebillsitemsSummaryController extends BaseController {
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
     public AjaxResult export(TWarehouseBills tWarehouseBills) {
+        String excelName = "";
+        if (tWarehouseBills.getfBilltype().equals("SJRK")) {
+            excelName = "出入库统计-入库";
+        } else if (tWarehouseBills.getfBilltype().equals("SJCK")){
+            excelName = "出入库统计-出库";
+        }
         List<TWareHouseItemsExcel> list = itWarehouseBillsService.selectTWarehousebillsItemsList(tWarehouseBills);
         ExcelUtil<TWareHouseItemsExcel> util = new ExcelUtil<>(TWareHouseItemsExcel.class);
-        return util.statisticsExportExcel(list, "总账统计");
+        return util.statisticsExportExcel(list, excelName);
     }
 
     /**

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

@@ -62,10 +62,10 @@ public class TWarehouseAnalysisController extends BaseController {
         String exportName = null;
         if (tWarehousebillsitemsNew.getType().equals("1")) {
             tWarehousebillsitemsNew.setfBilltype("SJRK");
-            exportName = "在库";
+            exportName = "仓储分析-在库";
         } else {
             tWarehousebillsitemsNew.setfBilltype("SJCK");
-            exportName = "出库";
+            exportName = "仓储分析-出库";
         }
         List<TWarehousebillsitemsNew> list = tWarehousebillsitemsNewService.selectWarehouseBillItemsList(tWarehousebillsitemsNew);
         ExcelUtil<TWarehousebillsitemsNew> util = new ExcelUtil<>(TWarehousebillsitemsNew.class);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInAndOutStockController.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.excel.OutStock;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.warehouse.warehouseBusiness;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -10,6 +11,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
@@ -25,6 +27,11 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
 
@@ -72,6 +79,79 @@ public class TWarehouseInStockController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/longRageDownloadTemplate")
+    public AjaxResult longRageDownloadTemplate(){
+        String filePath = "";
+        try {
+            // 文件名
+            String fileName = "入库模板.xlsx";
+            // 请求地址以及文件名转换
+            String url = "http://121.36.212.131:8080/file/" + URLEncoder.encode(fileName,"UTF-8");
+            // 下载文件并返回文件名
+            filePath = downLoadFromUrl(url,fileName,RuoYiConfig.getDownloadPath());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return AjaxResult.success(filePath);
+    }
+
+    /**
+     * 远程文件下载
+     * @param urlStr 远程文件链接地址
+     * @param fileName 下载文件名称
+     * @param savePath 保存路径
+     * @return 返回下载的文件名
+     */
+    public static String downLoadFromUrl(String urlStr,String fileName,String savePath) {
+        try {
+            URL url = new URL(urlStr);
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            // 设置超时间为3秒
+            conn.setConnectTimeout(3 * 1000);
+            // 防止屏蔽程序抓取而返回403错误
+            conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+
+            // 得到输入流
+            InputStream inputStream = conn.getInputStream();
+            // 获取字节数组
+            byte[] getData = readInputStream(inputStream);
+
+            // 文件保存位置
+            File saveDir = new File(savePath);
+            if (!saveDir.exists()) {
+                saveDir.mkdir();
+            }
+            File file = new File(saveDir + File.separator + fileName);
+            FileOutputStream fos = new FileOutputStream(file);
+            fos.write(getData);
+            if (fos != null) {
+                fos.close();
+            }
+            if (inputStream != null) {
+                inputStream.close();
+            }
+            // System.out.println("info:"+url+" download success");
+            return fileName;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    /**
+     * 从输入流中获取字节数组
+     */
+    public static  byte[] readInputStream(InputStream inputStream) throws IOException {
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        while((len = inputStream.read(buffer)) != -1) {
+            bos.write(buffer, 0, len);
+        }
+        bos.close();
+        return bos.toByteArray();
+    }
+
     /**
      * 导出入库详情主表列表
      */
@@ -83,7 +163,7 @@ public class TWarehouseInStockController extends BaseController {
         tWarehouseBills.setfBilltype("SJRK");
         List<InStock> list = itWarehouseBillsService.inStockExport(tWarehouseBills);
         ExcelUtil<InStock> util = new ExcelUtil<InStock>(InStock.class);
-        return util.exportExcel(list, "入库");
+        return util.exportExcel(list, "仓储业务-入库");
     }
 
     /**

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

@@ -134,7 +134,7 @@ public class TWarehouseOutStockController extends BaseController {
         tWarehouseBills.setfBilltype("SJCK");
         List<OutStock> list = itWarehouseBillsService.outStockExport(tWarehouseBills);
         ExcelUtil<OutStock> util = new ExcelUtil<>(OutStock.class);
-        return util.exportExcel(list, "出库");
+        return util.exportExcel(list, "仓储业务-出库");
     }
 
     /**

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

@@ -206,6 +206,38 @@ public class TWarehouseStockTransferController extends BaseController {
     }
 
     /**
+     * 接单请核
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:add')")
+    @Log(title = "接单请核",businessType = BusinessType.INSERT)
+    @PostMapping("/submitWarehousingApproval")
+    @RepeatSubmit
+    public AjaxResult submitWarehousingApproval(
+            @RequestParam("tWarehouseBills") String tWarehouseBills,
+            @RequestParam("tEnclosure") String tEnclosure,
+            @RequestParam("tCntr") String tCntr,
+            @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
+            @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
+            @RequestParam("tWarehousebillsitems") String tWarehousebillsitems
+    ){
+        String billsType = "CKDB";
+        if (StringUtils.isNull(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
+            return AjaxResult.error("未找到仓库主表数据，请确认");
+        }
+        return itWarehouseBillsService.submitWarehousingApproval(tWarehouseBills,tWarehousebillsfeesCr,tWarehousebillsfeesDr,tWarehousebillsitems,tEnclosure,tCntr,billsType);
+    }
+
+    /**
+     * 撤销接单请核
+     */
+    @Log(title = "撤销接单请核",businessType = BusinessType.UPDATE)
+    @GetMapping("/withdrawOrdersById/{fId}")
+    @RepeatSubmit
+    public AjaxResult withdrawOrdersById(@PathVariable("fId") Long fId){
+        return itWarehouseBillsService.withdrawOrdersById(fId);
+    }
+
+    /**
      * 修改入库详情主表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:edit')")

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

@@ -131,9 +131,15 @@ public class TWarehousebillsfeesController extends BaseController {
      */
     @GetMapping("/queryMenuExport")
     public AjaxResult queryMenuExport(TWarehousebillsfees tWarehousebillsfees) {
+        String excelName = "";
+        if (tWarehousebillsfees.getfDc().equals("D")) {
+            excelName = "账单明细-收";
+        } else if (tWarehousebillsfees.getfDc().equals("C")) {
+            excelName = "账单明细-付";
+        }
         List<QueryMenu> list = tWarehousebillsfeesService.selectQueryMenuList(tWarehousebillsfees);
         ExcelUtil<QueryMenu> util = new ExcelUtil<>(QueryMenu.class);
-        return util.exportExcel(list, "账单明细");
+        return util.exportExcel(list, excelName);
     }
 
     /**
@@ -141,6 +147,12 @@ public class TWarehousebillsfeesController extends BaseController {
      */
     @GetMapping("/exportBillSubItemDetails")
     public AjaxResult exportBillSubItemDetails(TWarehousebillsfees tWarehousebillsfees){
-        return tWarehousebillsfeesService.exportBillSubItemDetails(tWarehousebillsfees);
+        String excelName = "";
+        if (tWarehousebillsfees.getfDc().equals("D")) {
+            excelName = "账单明细-分项-收";
+        } else if (tWarehousebillsfees.getfDc().equals("C")) {
+            excelName = "账单明细-分项-付";
+        }
+        return tWarehousebillsfeesService.exportBillSubItemDetails(tWarehousebillsfees,excelName);
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

@@ -417,6 +417,42 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         return num;
     }
 
+    /**
+     * 去掉字符串末尾逗号
+     */
+    public static StringBuilder removeTheLastComma(StringBuilder builder){
+        if (builder.length() > 0) {
+            builder.deleteCharAt(builder.length()-1);
+        }
+        return builder;
+    }
+
+    /**
+     * 将字符串中存的带双引号的数组，转换成 int 数组
+     */
+    public static int[] stringArrayDQMToInt(String content){
+        // 提取字符串中 [] 中的内容
+        String stringOne = StringUtils.strip(content,"[]");
+        // 提取字符串中 “” 中的内容
+        String stringTwo = stringOne.replace("\"","");
+        // 提取字符串中逗号分隔的内容并形成 String[]
+        String[] strings = stringTwo.split(",");
+        // 将 String[] 转换成 int[]
+        return Arrays.stream(strings).mapToInt(Integer::parseInt).toArray();
+    }
+
+    /**
+     * 将字符串中存的数组，转换成 int 数组
+     */
+    public static int[] stringArrayToIntArray(String content){
+        // 提取字符串中 [] 中的内容
+        String stringOne = StringUtils.strip(content,"[]");
+        // 提取字符串中逗号分隔的内容并形成 String[]
+        String[] strings = stringOne.split(",");
+        // 将 String[] 转换成 int[]
+        return Arrays.stream(strings).mapToInt(Integer::parseInt).toArray();
+    }
+
     @SuppressWarnings("unchecked")
     public static <T> T cast(Object obj) {
         return (T) obj;

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TCntr.java

@@ -15,7 +15,6 @@ import java.util.List;
  * @author ruoyi
  * @date 2021-03-22
  */
-@Data
 public class TCntr extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -24,9 +23,13 @@ public class TCntr extends BaseEntity
     private Long fId;
 
     /** 集装箱类型（1 普柜 2 冻柜） */
-    @Excel(name = "集装箱类型", readConverterExp = "1=,普=柜,2=,冻=柜")
+    //@Excel(name = "集装箱类型", readConverterExp = "1=,普=柜,2=,冻=柜")
     private Integer fType;
 
+    //箱柜类型
+    @Excel(name = "集装箱类型")
+    private String typeName;
+
     /** 编号 */
     @Excel(name = "编号")
     private String fNo;
@@ -52,7 +55,7 @@ public class TCntr extends BaseEntity
     private BigDecimal fCbm;
 
     /** 箱容量（吨） */
-    @Excel(name = "箱容量", readConverterExp = "吨=")
+    @Excel(name = "毛重", readConverterExp = "吨=")
     private BigDecimal fWeight;
 
     /** 尺码 （20 40 45） */
@@ -63,6 +66,39 @@ public class TCntr extends BaseEntity
     @Excel(name = "状态", readConverterExp = "默=认,T=,,=正常T,停=用F,下=拉选择")
     private String fStatus;
 
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String remark;
+
+    /**
+     * 录入人
+     */
+    @Excel(name = "录入人")
+    private String createBy;
+
+    /**
+     * 录入时间
+     */
+    @Excel(name = "录入时间")
+    private String inCreateTime;
+
+    /**
+     * 最新修改人
+     */
+    @Excel(name = "最新修改人")
+    private String updateBy;
+
+    /**
+     * 最新修改时间
+     */
+    @Excel(name = "最新修改时间")
+    private String outUpdateTime;
+
+    //查询时间区间
+    private List<String> cLoadDate;
+
     public Long getfId() {
         return fId;
     }
@@ -79,6 +115,14 @@ public class TCntr extends BaseEntity
         this.fType = fType;
     }
 
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
     public String getfNo() {
         return fNo;
     }
@@ -151,6 +195,26 @@ public class TCntr extends BaseEntity
         this.fStatus = fStatus;
     }
 
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    @Override
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
     public List<String> getcLoadDate() {
         return cLoadDate;
     }
@@ -159,20 +223,29 @@ public class TCntr extends BaseEntity
         this.cLoadDate = cLoadDate;
     }
 
-    public String getTypeName() {
-        return typeName;
+    public String getInCreateTime() {
+        return inCreateTime;
     }
 
-    public void setTypeName(String typeName) {
-        this.typeName = typeName;
+    public void setInCreateTime(String inCreateTime) {
+        this.inCreateTime = inCreateTime;
     }
 
+    @Override
+    public String getUpdateBy() {
+        return updateBy;
+    }
 
-    //查询时间区间
-    private List<String> cLoadDate;
-    //箱柜类型
-    private String typeName;
-
+    @Override
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
 
+    public String getOutUpdateTime() {
+        return outUpdateTime;
+    }
 
+    public void setOutUpdateTime(String outUpdateTime) {
+        this.outUpdateTime = outUpdateTime;
+    }
 }

ruoyi-shipping/src/main/resources/mapper/shipping/TCntrMapper.xml

@@ -18,8 +18,10 @@
         <result property="fStatus" column="f_status"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
+        <result property="inCreateTime" column="in_create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="outUpdateTime" column="out_update_time"/>
         <result property="remark" column="remark"/>
     </resultMap>
 
@@ -45,8 +47,10 @@
         '正常' ELSE '停用'
         END AS f_status,
         create_by,
+        date_format(create_time, '%Y-%m-%d') in_create_time,
         create_time,
         update_by,
+        date_format(update_time, '%Y-%m-%d') out_update_time,
         update_time,
         remark
         FROM

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TCorps.java

@@ -25,9 +25,12 @@ public class TCorps extends BaseEntity {
     private Long fPid;
 
     /** 客户类别 */
-    @Excel(name = "客户类别")
     private String fTypeid;
 
+    /** 客户类别(拼接起来的) */
+    @Excel(name = "客户类别")
+    private String fTypename;
+
     /** 编号 */
     @Excel(name = "编号")
     private String fNo;
@@ -81,7 +84,7 @@ public class TCorps extends BaseEntity {
     private String fCity;
 
     /** 结算表票结、月结 */
-    @Excel(name = "结算表票结、月结")
+    @Excel(name = "结算方式",dictType = "data_stltype_type")
     private Long fStltypeid;
 
     /** 结费天数 */
@@ -131,16 +134,17 @@ public class TCorps extends BaseEntity {
     private String fUbankname;
 
     /** 状态默认 T ,正常T 停用F 下拉选择 */
-    @Excel(name = "状态默认 T ,正常T 停用F 下拉选择")
     private String fStatus;
 
+    /**
+     * 状态默认名称
+     */
+    @Excel(name = "状态默认")
+    private String fStatusString;
+
     /** 删除状态 */
     private String delFlag;
 
-    /** 客户类别(拼接起来的) */
-    @Excel(name = "客户类别(拼接起来的)")
-    private String fTypename;
-
     /** 登陆账号 */
     @Excel(name = "登陆账号")
     private String loginAccount;
@@ -150,7 +154,7 @@ public class TCorps extends BaseEntity {
     private String creditLv;
 
     /** 账期天数(订单结束后最迟结款天数)  */
-    @Excel(name = "账期天数(订单结束后最迟结款天数) ")
+    @Excel(name = "账期天数")
     private Long paymentDays;
 
     /** 公司车辆数 */
@@ -227,6 +231,14 @@ public class TCorps extends BaseEntity {
     /** 部门 */
     private String deptId;
 
+    public String getfStatusString() {
+        return fStatusString;
+    }
+
+    public void setfStatusString(String fStatusString) {
+        this.fStatusString = fStatusString;
+    }
+
     public Long getfId() {
         return fId;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TCorpsMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.basicData.domain.TCustomerContact;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TCorpsServiceImpl.java

@@ -10,6 +10,7 @@ import com.ruoyi.basicData.service.ITCorpsService;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;

ruoyi-warehouse/src/main/java/com/ruoyi/quotation/domain/TSeaprice.java

@@ -23,13 +23,21 @@ public class TSeaprice extends BaseEntity
     private Long fId;
 
     /** 业务类型 */
-    @Excel(name = "业务类型")
     private Long fBilltype;
 
+    /** 业务类型名称 */
+    @Excel(name = "业务类型")
+    private String fBilltypeName;
+
     /** 船公司(客户表) */
-    @Excel(name = "船公司(客户表)")
     private Long fCorpid;
 
+    /**
+     * 船公司对应名称
+     */
+    @Excel(name = "船公司(客户表)")
+    private String fNamec;
+
     /** 客户名称 */
     private String fCorpName;
 
@@ -45,13 +53,23 @@ public class TSeaprice extends BaseEntity
     }
 
     /** 起运港ID */
-    @Excel(name = "起运港ID")
     private Long polId;
 
+    /**
+     * 起运港名称
+     */
+    @Excel(name = "起运港")
+    private String polName;
+
     /** 目的港ID */
-    @Excel(name = "目的港ID")
     private Long podId;
 
+    /**
+     * 目的港名称
+     */
+    @Excel(name = "目的港")
+    private String podName;
+
     /** 中转港ID */
     private Long fTransitPortId;
 
@@ -115,9 +133,28 @@ public class TSeaprice extends BaseEntity
     private String fDateChanged;
 
     /** 状态(0有效1无效) */
-    @Excel(name = "状态(0有效1无效)")
     private Long fBillstatus;
 
+    /**
+     * 状态名称
+     */
+    @Excel(name = "状态")
+    private String fBillstatusName;
+
+    /**
+     * 录入人
+     */
+    @Excel(name = "录入人")
+    private String createBy;
+
+    /** 航线名称 */
+    @Excel(name = "航线")
+    private String fLineName;
+
+    /** 订舱代理名称 */
+    @Excel(name = "订航代理")
+    private String fBookagentName;
+
     /** 删除状态 */
     private String delFlag;
 
@@ -159,11 +196,55 @@ public class TSeaprice extends BaseEntity
     /** 订舱代理ID */
     private String fBookagentid;
 
-    /** 航线名称 */
-    private String fLineName;
+    @Override
+    public String getCreateBy() {
+        return createBy;
+    }
 
-    /** 订舱代理名称 */
-    private String fBookagentName;
+    @Override
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getfBillstatusName() {
+        return fBillstatusName;
+    }
+
+    public void setfBillstatusName(String fBillstatusName) {
+        this.fBillstatusName = fBillstatusName;
+    }
+
+    public String getfNamec() {
+        return fNamec;
+    }
+
+    public void setfNamec(String fNamec) {
+        this.fNamec = fNamec;
+    }
+
+    public String getPolName() {
+        return polName;
+    }
+
+    public void setPolName(String polName) {
+        this.polName = polName;
+    }
+
+    public String getPodName() {
+        return podName;
+    }
+
+    public void setPodName(String podName) {
+        this.podName = podName;
+    }
+
+    public String getfBilltypeName() {
+        return fBilltypeName;
+    }
+
+    public void setfBilltypeName(String fBilltypeName) {
+        this.fBilltypeName = fBilltypeName;
+    }
 
     public String getfLineName() {
         return fLineName;

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

@@ -19,6 +19,12 @@ public class TWarehouseAgreement extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 序号
+     */
+    @Excel(name = "序号")
+    private Long rankNo;
+
+    /**
      * $column.columnComment
      */
     private Long fId;
@@ -26,7 +32,7 @@ public class TWarehouseAgreement extends BaseEntity {
     /**
      * 业务编号,格式WA+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始
      */
-    @Excel(name = "业务编号,格式WA+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始 ")
+    @Excel(name = "业务编号")
     private String fBillno;
 
     /**
@@ -38,16 +44,26 @@ public class TWarehouseAgreement extends BaseEntity {
     /**
      * 制单部门
      */
-    @Excel(name = "制单部门")
     private Long fDeptid;
 
     /**
+     * 制单部门名称
+     */
+    @Excel(name = "制单部门")
+    private String fDeptName;
+
+    /**
      * 客户名称,t_corps 中的no或 name，模糊查找选择后，存储id，显示name
      */
-    @Excel(name = "客户名称,t_corps 中的no或 name，模糊查找选择后，存储id，显示name")
     private Long fCorpid;
 
     /**
+     * 客户名称
+     */
+    @Excel(name = "客户名称")
+    private String fCorpName;
+
+    /**
      * 货物品名,t_goods 中的no或 name，模糊查找选择后，存储f_id，显示name
      */
     private String fGoodsid;
@@ -55,28 +71,54 @@ public class TWarehouseAgreement extends BaseEntity {
     /**
      * 结算方式,也可以从表t_stltypes中下拉选择，存储id，显示name
      */
-    @Excel(name = "结算方式,也可以从表t_stltypes中下拉选择，存储id，显示name")
     private Long fStltypeid;
 
     /**
+     * 结算方式名称
+     */
+    @Excel(name = "结算方式")
+    private String fStltypeName;
+
+    /**
      * 费用类型,0，仓储费 1 作业费
      */
-    @Excel(name = "费用类型,0，仓储费 1 作业费")
     private Long fFeetypeid;
 
     /**
+     * 费用类型名称
+     */
+    @Excel(name = "费用类型")
+    private String fFeetypeName;
+
+    /**
+     * 作业费类型名称
+     */
+    @Excel(name = "作业费类型")
+    private String fTaskTypeName;
+
+    /**
      * 货物类别,存储t_packages，f_id 显示名称，可以多选t_packages 中的no或 name，模糊查找选择后，存储f_id，显示name
      */
-    @Excel(name = "货物类别,存储t_packages，f_id 显示名称，可以多选t_packages 中的no或 name，模糊查找选择后，存储f_id，显示name")
     private String tPackages;
 
     /**
+     * 货物类别
+     */
+    @Excel(name = "货物类别")
+    private StringBuilder tPackagesName;
+
+    /**
      * 贸易方式,对应t_trademodels
      */
-    @Excel(name = "贸易方式,对应t_trademodels ")
     private Long fTrademodeid;
 
     /**
+     * 贸易方式名称
+     */
+    @Excel(name = "贸易方式")
+    private String fTrademodeName;
+
+    /**
      * 免堆天数
      */
     @Excel(name = "免堆天数")
@@ -99,13 +141,12 @@ public class TWarehouseAgreement extends BaseEntity {
     /**
      * 状态,N 录入中，T审核通过
      */
-    @Excel(name = "状态,N 录入中，T审核通过")
+    @Excel(name = "状态")
     private String fBillstatus;
 
     /**
      * 审批状态,N 录入中，T审核通过
      */
-    @Excel(name = "状态")
     private String fStatus;
 
     /**
@@ -117,13 +158,11 @@ public class TWarehouseAgreement extends BaseEntity {
     /**
      * 作业费类型
      */
-    @Excel(name = "作业费类型")
     private Long fTaskType;
 
     /**
      * 费用类型
      */
-    @Excel(name = "费用类型")
     private String fDc;
 
     /**
@@ -134,20 +173,96 @@ public class TWarehouseAgreement extends BaseEntity {
     /**
      * 费用类型
      */
-    @Excel(name = "类型名称")
     private String fBilltypeName;
 
     /**
      * 仓库
      */
-    @Excel(name = "仓库")
     private String fWarehouseid;
 
     /**
+     * 仓库导出数据
+     */
+    @Excel(name = "仓库")
+    private StringBuilder fWarehouseName;
+
+    /**
      * 提醒天数
      */
     private Long remindDays;
 
+    public StringBuilder getfWarehouseName() {
+        return fWarehouseName;
+    }
+
+    public void setfWarehouseName(StringBuilder fWarehouseName) {
+        this.fWarehouseName = fWarehouseName;
+    }
+
+    public StringBuilder gettPackagesName() {
+        return tPackagesName;
+    }
+
+    public void settPackagesName(StringBuilder tPackagesName) {
+        this.tPackagesName = tPackagesName;
+    }
+
+    public Long getRankNo() {
+        return rankNo;
+    }
+
+    public void setRankNo(Long rankNo) {
+        this.rankNo = rankNo;
+    }
+
+    public String getfTrademodeName() {
+        return fTrademodeName;
+    }
+
+    public void setfTrademodeName(String fTrademodeName) {
+        this.fTrademodeName = fTrademodeName;
+    }
+
+    public String getfStltypeName() {
+        return fStltypeName;
+    }
+
+    public void setfStltypeName(String fStltypeName) {
+        this.fStltypeName = fStltypeName;
+    }
+
+    public String getfTaskTypeName() {
+        return fTaskTypeName;
+    }
+
+    public void setfTaskTypeName(String fTaskTypeName) {
+        this.fTaskTypeName = fTaskTypeName;
+    }
+
+    public String getfFeetypeName() {
+        return fFeetypeName;
+    }
+
+    public void setfFeetypeName(String fFeetypeName) {
+        this.fFeetypeName = fFeetypeName;
+    }
+
+    public String getfDeptName() {
+        return fDeptName;
+    }
+
+    public void setfDeptName(String fDeptName) {
+        this.fDeptName = fDeptName;
+    }
+
+    public String getfCorpName() {
+        return fCorpName;
+    }
+
+    public void setfCorpName(String fCorpName) {
+        this.fCorpName = fCorpName;
+    }
+
     public String getfWarehouseid() {
         return fWarehouseid;
     }

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

@@ -276,7 +276,7 @@ public class TWarehouseBills extends BaseEntity {
     private Long fBankcorpid;
 
     /**
-     * 单据类型(数据字典)SJRK（入库） SJCK（实际出库） CKDB（调拨） HQZY（货权转移）
+     * 单据类型(数据字典)SJRK（入库） SJCK（实际出库） CKDB（调拨） HQZY（货权转移） HWTG（货物通关）
      */
     @Excel(name = "单据类型(数据字典)SJRK", readConverterExp = "入=库")
     private String fBilltype;

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseAgreementMapper.java

@@ -1,8 +1,11 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 
+import com.ruoyi.basicData.domain.TGoods;
+import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseAgreement;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
 
 import java.util.List;
 import java.util.Map;
@@ -38,6 +41,16 @@ public interface TWarehouseAgreementMapper {
     public List<TWarehouseAgreement> selectTWarehouseAgreementList(TWarehouseAgreement tWarehouseAgreement);
 
     /**
+     * 根据商品类别 ids 获取商品类别数据
+     */
+    List<TGoods> selectTGoodsTypeByTypeId(@Param("typeIds") int[] typeIds);
+
+    /**
+     * 根据仓库 ids 获取仓库数据
+     */
+    List<TWarehouse> selectTWarehouseByIds(@Param("fIds") int[] fIds);
+
+    /**
      * 新增仓储费
      *
      * @param tWarehouseAgreement 仓储费

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

@@ -96,5 +96,5 @@ public interface ITWarehousebillsfeesService {
      * @param tWarehousebillsfees
      * @return
      */
-    AjaxResult exportBillSubItemDetails(TWarehousebillsfees tWarehousebillsfees);
+    AjaxResult exportBillSubItemDetails(TWarehousebillsfees tWarehousebillsfees,String excelName);
 }

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

@@ -8,10 +8,12 @@ import com.ruoyi.approvalFlow.domain.AuditItems;
 import com.ruoyi.approvalFlow.service.impl.AuditItemsServiceImpl;
 import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.basicData.domain.TFees;
+import com.ruoyi.basicData.domain.TGoods;
 import com.ruoyi.basicData.mapper.TCorpsMapper;
 import com.ruoyi.basicData.mapper.TFeesMapper;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.exception.BaseException;
 import com.ruoyi.common.exception.WarehouseException;
@@ -21,10 +23,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.mapper.SysConfigMapper;
 import com.ruoyi.system.mapper.SysDeptMapper;
-import com.ruoyi.warehouseBusiness.domain.BillnoDel;
-import com.ruoyi.warehouseBusiness.domain.TAnnex;
-import com.ruoyi.warehouseBusiness.domain.TWarehouseAgreement;
-import com.ruoyi.warehouseBusiness.domain.TWarehouseAgreementitems;
+import com.ruoyi.warehouseBusiness.domain.*;
 import com.ruoyi.warehouseBusiness.domain.dto.CalculateStorageFeesDTO;
 import com.ruoyi.warehouseBusiness.domain.dto.StorageFeeRangeDTO;
 import com.ruoyi.warehouseBusiness.domain.enums.AnnexActEnum;
@@ -173,7 +172,32 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
      */
     @Override
     public List<TWarehouseAgreement> selectTWarehouseAgreementList(TWarehouseAgreement tWarehouseAgreement) {
-        return tWarehouseAgreementMapper.selectTWarehouseAgreementList(tWarehouseAgreement);
+        List<TWarehouseAgreement> list = tWarehouseAgreementMapper.selectTWarehouseAgreementList(tWarehouseAgreement);
+        // 遍历查询结果
+        for (TWarehouseAgreement tg : list) {
+            // 筛选 packages
+            if (tg.gettPackages()!=null) {
+                // 根据货物类别数组字串获取货物数据
+                List<TGoods> tGoods = tWarehouseAgreementMapper.selectTGoodsTypeByTypeId(StringUtils.stringArrayDQMToInt(tg.gettPackages()));
+                StringBuilder strGoods = new StringBuilder();
+                for (TGoods goods : tGoods) { // 遍历得到的货物结果
+                    // 装在并用逗号隔开
+                    strGoods.append(goods.getfName()).append(",");
+                }
+                tg.settPackagesName(StringUtils.removeTheLastComma(strGoods));
+            }
+            // 筛选 fwarehouseid
+            if (tg.getfWarehouseid() != null) { // 如果仓库 id 存在
+                // 根据仓库 id 数组字串获取仓库数据
+                List<TWarehouse> tWarehouses = tWarehouseAgreementMapper.selectTWarehouseByIds(StringUtils.stringArrayToIntArray(tg.getfWarehouseid()));
+                StringBuilder strTWarehouse = new StringBuilder();
+                for (TWarehouse tWarehouse : tWarehouses) {
+                    strTWarehouse.append(tWarehouse.getfName()).append(",");
+                }
+                tg.setfWarehouseName(StringUtils.removeTheLastComma(strTWarehouse));
+            }
+        }
+        return list;
     }
 
 

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

@@ -2487,7 +2487,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         boolean isApprove = false;
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Long actId = queryWarehouseActId(billsType);
-        if ("SJRK".equals(billsType) || "SJCK".equals(billsType)) {
+        if ("SJRK".equals(billsType) || "SJCK".equals(billsType) || "CKDB".equals(billsType)) {
             SysConfig sysConfig = queryWarehouseConfig(billsType);
             if (StringUtils.isNull(sysConfig)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

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

@@ -205,11 +205,11 @@ public class TWarehousebillsfeesServiceImpl implements ITWarehousebillsfeesServi
     }
 
     @Override
-    public AjaxResult exportBillSubItemDetails(TWarehousebillsfees tWarehousebillsfees) {
+    public AjaxResult exportBillSubItemDetails(TWarehousebillsfees tWarehousebillsfees,String excelName) {
         // 创建 workbook，对应一个 excel 文件
         HSSFWorkbook wb = new HSSFWorkbook();
         // 在 workbook 中添加一个sheet，对应 excel 文档中的 sheet
-        HSSFSheet sheet = wb.createSheet("分项明细");
+        HSSFSheet sheet = wb.createSheet(excelName);;
         // 获取 cell 样式
         HSSFCellStyle cellTitleStyle = getCellStyle(wb, "center", true);
         HSSFCellStyle cellContentStyle = getCellStyle(wb, "center", true);
@@ -350,9 +350,8 @@ public class TWarehousebillsfeesServiceImpl implements ITWarehousebillsfeesServi
             sheet.autoSizeColumn(i);
             sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 17 / 10);
         }
-
         // 导出 excel
-        String fileName = "账单明细导出分项.xls";
+        String fileName = excelName + ".xls";
         // 创建导出流
         try {
             OutputStream out = new FileOutputStream(getAbsoluteFile(fileName));

ruoyi-warehouse/src/main/resources/mapper/basicData/TCorpsMapper.xml

@@ -34,6 +34,7 @@
         <result property="fUbankno"    column="f_ubankno"    />
         <result property="fUbankname"    column="f_ubankname"    />
         <result property="fStatus"    column="f_status"    />
+        <result property="fStatusString"    column="f_status_string"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -67,7 +68,12 @@
     <sql id="selectTCorpsVo">
         select f_id, f_pid, f_typeid, f_no, f_name, f_cname, f_ename, f_tel, f_fax, f_email, f_manage, f_addr, f_eaddr, f_scale, f_province,
          f_city, f_stltypeid, f_stldays, f_contractno, f_contractb, f_contracte, f_tax, f_invtel, f_invaddr, f_bankno, f_bankname, f_ubankno,
-          f_ubankname, f_status, del_flag, create_by, create_time, update_by, update_time, remark, f_typename, login_account, credit_lv,
+          f_ubankname, f_status,
+               CASE
+                WHEN f_status = 0 THEN  '正常'
+                WHEN f_status = 1 THEN  '停用'
+                END as f_status_string
+               , del_flag, create_by, create_time, update_by, update_time, remark, f_typename, login_account, credit_lv,
            payment_days, car_num, head_office, registerd_capital, legal_person, insdustry, credit_num, taxpayer_num, industry_commerce_num,
             organization_num, register_organization, date_of_establishment, company_type, business_deadline, business_area, annual_date,
              registerd_address, manage_scope, dept_id from t_corps

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

@@ -1999,7 +1999,7 @@
             ware.create_time AS createTime,
             ware.f_accbilldate AS fAccbilldate,
             ware.t_mblno AS tMblno,
-            dict.dict_label AS chargingMethod,
+            dic.dict_label AS chargingMethod,
             ware.invoice_no AS invoiceNo,
             ware.bank AS bank,
             ware.water_bill_no AS waterBillNo,
@@ -2019,10 +2019,16 @@
             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
+            LEFT JOIN (
+                SELECT *
+                FROM sys_dict_data dic
+                WHERE
+                dic.dict_label =
+                IF(
+                (dic.`status`='0' AND dic.dict_type = 'data_settlement_type')
+                ,dic.dict_label,NULL)
+            ) dic ON dic.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>

ruoyi-warehouse/src/main/resources/mapper/quotation/TSeapriceMapper.xml

@@ -7,12 +7,16 @@
     <resultMap type="TSeaprice" id="TSeapriceResult">
         <result property="fId" column="f_id"/>
         <result property="fBilltype" column="f_billtype"/>
+        <result property="fBilltypeName" column="f_billtype_name"/>
         <result property="fCorpid" column="f_corpid"/>
         <result property="polId" column="pol_id"/>
+        <result property="polName" column="pol_name"/>
         <result property="podId" column="pod_id"/>
+        <result property="podName" column="pod_name"/>
         <result property="fValiddate" column="f_validdate"/>
         <result property="fDateChanged" column="f_date_changed"/>
         <result property="fBillstatus" column="f_billstatus"/>
+        <result property="fBillstatusName" column="f_billstatus_name"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -23,19 +27,26 @@
         <result property="fBookagentid" column="f_bookagentid"/>
         <result property="fLineName" column="f_line_name"/>
         <result property="fBookagentName" column="f_bookagent_name"/>
-        <result property="fTransitPortId"    column="f_transit_port_id"    />
-        <result property="fSailingSchedule"    column="f_sailing_schedule"    />
-        <result property="fVoyage"    column="f_voyage"    />
+        <result property="fTransitPortId" column="f_transit_port_id"/>
+        <result property="fSailingSchedule" column="f_sailing_schedule"/>
+        <result property="fVoyage" column="f_voyage"/>
     </resultMap>
 
     <sql id="selectTSeapriceVo">
         select s.f_id,
                s.f_billtype,
+               dic.dict_label as f_billtype_name,
                s.f_corpid,
                s.pol_id,
+               ltd.f_name as pol_name,
                s.pod_id,
+               dtd.f_name as pod_name,
                s.f_validdate,
                s.f_date_changed,
+               CASE
+                   WHEN s.f_billstatus=0 THEN '正常'
+                   WHEN s.f_billstatus=1 THEN '停用'
+                END as f_billstatus_name,
                s.f_billstatus,
                s.del_flag,
                s.create_by,
@@ -48,11 +59,20 @@
                s.f_transit_port_id,
                s.f_sailing_schedule,
                s.f_voyage,
-            j.f_name AS f_line_name,
-               q.f_name AS f_bookagent_name
+               j.f_name  AS f_line_name,
+               q.f_name  AS f_bookagent_name,
+               tc.f_name AS fNamec
         from t_seaprice s
                  LEFT JOIN t_address j ON s.f_lineid = j.f_id
                  LEFT JOIN t_corps q ON s.f_bookagentid = q.f_id
+                 LEFT JOIN t_corps tc ON s.f_corpid = tc.f_id
+                 LEFT JOIN (
+                    SELECT *
+                    FROM sys_dict_data dic
+                    WHERE dic.dict_label = IF(dic.dict_type = "data_billType", dic.dict_label, NULL)
+                ) dic ON dic.dict_value = s.f_billtype
+                 LEFT JOIN t_address ltd ON s.pol_id = ltd.f_id
+                 LEFT JOIN t_address dtd ON s.pod_id = dtd.f_id
     </sql>
 
     <select id="selectTSeapriceList" parameterType="TSeaprice" resultMap="TSeapriceResult">
@@ -72,9 +92,11 @@
             </if>
             <if test="fLineid != null  and fLineid != ''">and f_lineid = #{fLineid}</if>
             <if test="fBookagentid != null  and fBookagentid != ''">and f_bookagentid = #{fBookagentid}</if>
-            <if test="fTransitPortId != null "> and f_transit_port_id = #{fTransitPortId}</if>
-            <if test="fSailingSchedule != null  and fSailingSchedule != ''"> and f_sailing_schedule = #{fSailingSchedule}</if>
-            <if test="fVoyage != null "> and f_voyage = #{fVoyage}</if>
+            <if test="fTransitPortId != null ">and f_transit_port_id = #{fTransitPortId}</if>
+            <if test="fSailingSchedule != null  and fSailingSchedule != ''">and f_sailing_schedule =
+                #{fSailingSchedule}
+            </if>
+            <if test="fVoyage != null ">and f_voyage = #{fVoyage}</if>
 
         </where>
     </select>
@@ -127,11 +149,13 @@
             <if test="remarks != null  and remarks != ''">and remarks = #{remarks}</if>
             <if test="fLineid != null  and fLineid != ''">and f_lineid = #{fLineid}</if>
             <if test="fBookagentid != null  and fBookagentid != ''">and f_bookagentid = #{fBookagentid}</if>
-            <if test="fTransitPortId != null "> and f_transit_port_id = #{fTransitPortId}</if>
-            <if test="fSailingSchedule != null  and fSailingSchedule != ''"> and f_sailing_schedule = #{fSailingSchedule}</if>
-            <if test="fVoyage != null "> and f_voyage = #{fVoyage}</if>
+            <if test="fTransitPortId != null ">and f_transit_port_id = #{fTransitPortId}</if>
+            <if test="fSailingSchedule != null  and fSailingSchedule != ''">and f_sailing_schedule =
+                #{fSailingSchedule}
+            </if>
+            <if test="fVoyage != null ">and f_voyage = #{fVoyage}</if>
             <if test="fValiddateBegin != null and fValiddateBegin != '' and fValiddateEnd != null and fValiddateEnd!= ''">
-             and s.f_validdate BETWEEN #{fValiddateBegin} AND #{fValiddateEnd}
+                and s.f_validdate BETWEEN #{fValiddateBegin} AND #{fValiddateEnd}
             </if>
         </where>
         ORDER BY s.f_id DESC
@@ -162,7 +186,7 @@
     </select>
 
     <select id="selectSeapriceItem" parameterType="TSeaprice" resultType="Map">
-        SELECT f.f_name fFeeid,s.remark remark,IF(s.f_type = '0', s.${fSpecification}, s.f_unitprice) fUnitprice
+        SELECT f.f_name fFeeid, s.remark remark, IF(s.f_type = '0', s.${fSpecification}, s.f_unitprice) fUnitprice
         FROM t_seaprice t
                  LEFT JOIN t_seapriceitem s ON s.f_pid = t.f_id
                  LEFT JOIN t_fees f ON f.f_id = s.f_feeid
@@ -190,8 +214,7 @@
           AND t.f_billstatus = 0
           AND t.del_flag = '0'
           AND f.f_name = '海运费'
-        ORDER BY s.f_id asc
-        LIMIT 0, 1
+        ORDER BY s.f_id asc LIMIT 0, 1
     </select>
 
     <insert id="insertTSeaprice" parameterType="TSeaprice" useGeneratedKeys="true" keyProperty="fId">

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

@@ -5,16 +5,22 @@
 <mapper namespace="com.ruoyi.warehouseBusiness.mapper.TWarehouseAgreementMapper">
 
     <resultMap type="TWarehouseAgreement" id="TWarehouseAgreementResult">
+        <result property="rankNo" column="rank_no"/>
         <result property="fId" column="f_id"/>
         <result property="fBillno" column="f_billno"/>
         <result property="fContractno" column="f_contractno"/>
         <result property="fDeptid" column="f_deptid"/>
+        <result property="fDeptName" column="f_deptname"/>
         <result property="fCorpid" column="f_corpid"/>
+        <result property="fCorpName" column="f_corpname"/>
         <result property="fGoodsid" column="f_goodsid"/>
+        <result property="fStltypeName" column="f_stltypename"/>
         <result property="fStltypeid" column="f_stltypeid"/>
         <result property="fFeetypeid" column="f_feetypeid"/>
+        <result property="fFeetypeName" column="f_feetypename"/>
         <result property="tPackages" column="t_packages"/>
         <result property="fTrademodeid" column="f_trademodeid"/>
+        <result property="fTrademodeName" column="f_trademodename"/>
         <result property="fFreedays" column="f_freedays"/>
         <result property="fBegindate" column="f_begindate"/>
         <result property="fEnddate" column="f_enddate"/>
@@ -26,6 +32,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="fTaskTypeName" column="f_task_type_name"/>
         <result property="fTaskType" column="f_task_type"/>
         <result property="fDc" column="f_dc"/>
         <result property="fBilltype" column="f_billtype"/>
@@ -65,28 +72,110 @@
 
     <select id="selectTWarehouseAgreementList" parameterType="TWarehouseAgreement"
             resultMap="TWarehouseAgreementResult">
-        <include refid="selectTWarehouseAgreementVo"/>
+        select
+            @rank:=@rank + 1 as rank_no,
+            a.*
+        from
+        (
+            select
+            twg.f_id,
+            twg.f_billno,
+            twg.f_contractno,
+            twg.f_deptid,
+            dept.dept_name as f_deptname,
+            corp.f_name as f_corpname,
+            twg.f_goodsid,
+            dict.dict_label as f_stltypename,
+            twg.f_stltypeid,
+            twg.f_feetypeid,
+            CASE
+            WHEN twg.f_feetypeid='D' THEN '收'
+            WHEN twg.f_feetypeid='C' THEN '付'
+            END as f_feetypename,
+            twg.t_packages,
+            twg.f_trademodeid,
+            dttradmode.dict_label as f_trademodename,
+            twg.f_freedays,
+            twg.f_begindate,
+            twg.f_enddate,
+            CASE
+            WHEN twg.f_billstatus=1 THEN '保存'
+            WHEN twg.f_billstatus=2 THEN '暂存'
+            WHEN twg.f_billstatus=3 THEN '审批驳回'
+            WHEN twg.f_billstatus=4 THEN '提交审核'
+            WHEN twg.f_billstatus=5 THEN '审核中'
+            WHEN twg.f_billstatus=6 THEN '审核完成'
+            END as f_billstatus,
+            twg.f_status,
+            twg.del_flag,
+            twg.create_by,
+            twg.create_time,
+            twg.update_by,
+            twg.update_time,
+            twg.remark,
+            CASE
+            WHEN twg.f_task_type=1 THEN '车队作业费'
+            WHEN twg.f_task_type=2 THEN '劳务作业费'
+            END as f_task_type_name,
+            twg.f_task_type,
+            twg.f_dc,
+            twg.f_billtype,
+            twg.f_billtype_name,
+            twg.f_warehouseid
+            from t_warehouse_agreement twg
+            LEFT JOIN t_corps corp ON corp.f_id = twg.f_corpid
+            LEFT JOIN sys_dept dept ON dept.dept_id = twg.f_deptid
+            LEFT JOIN (
+            SELECT
+            *
+            FROM
+            sys_dict_data dictIn
+            WHERE
+            dictIn.dict_label =
+            IF(
+            (
+            (dictIn.dict_type = 'data_stltype_type' AND dictIn.`status`='0' AND dictIn.dict_value=1) OR
+            (dictIn.dict_type = 'data_stltype_type' AND dictIn.`status`='0' AND dictIn.dict_value=0)
+            ),
+            dictIn.dict_label,NULL
+            )
+            ) dict ON dict.dict_value = twg.f_billtype
+            LEFT JOIN (
+            SELECT
+            *
+            FROM
+            sys_dict_data dictIn
+            WHERE
+            dictIn.dict_label =
+            IF(
+            (dictIn.dict_type = 'data_trademodes' AND dictIn.`status`='0'),
+            dictIn.dict_label,NULL
+            )
+            ) dttradmode ON dttradmode.dict_value = twg.f_billtype
         <where>
-            <if test="fBillno != null  and fBillno != ''">and f_billno = #{fBillno}</if>
-            <if test="fContractno != null  and fContractno != ''">and f_contractno = #{fContractno}</if>
-            <if test="fDeptid != null ">and f_deptid = #{fDeptid}</if>
-            <if test="fCorpid != null ">and f_corpid = #{fCorpid}</if>
-            <if test="fGoodsid != null ">and f_goodsid = #{fGoodsid}</if>
-            <if test="fStltypeid != null ">and f_stltypeid = #{fStltypeid}</if>
-            <if test="fFeetypeid != null ">and f_feetypeid = #{fFeetypeid}</if>
-            <if test="tPackages != null  and tPackages != ''">and t_packages = #{tPackages}</if>
-            <if test="fTrademodeid != null ">and f_trademodeid = #{fTrademodeid}</if>
-            <if test="fFreedays != null ">and f_freedays = #{fFreedays}</if>
-            <if test="fBegindate != null ">and f_begindate = #{fBegindate}</if>
-            <if test="fEnddate != null ">and f_enddate = #{fEnddate}</if>
-            <if test="fTaskType != null ">and f_task_type = #{fTaskType}</if>
-            <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
-            <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
-            <if test="fBilltype != null  and fBilltype != ''">and f_billtype like concat('%', #{fBilltype}, '%')</if>
-            <if test="fBilltypeName != null  and fBilltypeName != ''">and f_billtype_name like concat('%',
+            <if test="fBillno != null  and fBillno != ''">and twg.f_billno = #{fBillno}</if>
+            <if test="fContractno != null  and fContractno != ''">and twg.f_contractno = #{fContractno}</if>
+            <if test="fDeptid != null ">and twg.f_deptid = #{fDeptid}</if>
+            <if test="fCorpid != null ">and twg.f_corpid = #{fCorpid}</if>
+            <if test="fGoodsid != null ">and twg.f_goodsid = #{fGoodsid}</if>
+            <if test="fStltypeid != null ">and twg.f_stltypeid = #{fStltypeid}</if>
+            <if test="fFeetypeid != null ">and twg.f_feetypeid = #{fFeetypeid}</if>
+            <if test="tPackages != null  and tPackages != ''">and twg.t_packages = #{tPackages}</if>
+            <if test="fTrademodeid != null ">and twg.f_trademodeid = #{fTrademodeid}</if>
+            <if test="fFreedays != null ">and twg.f_freedays = #{fFreedays}</if>
+            <if test="fBegindate != null ">and twg.f_begindate = #{fBegindate}</if>
+            <if test="fEnddate != null ">and twg.f_enddate = #{fEnddate}</if>
+            <if test="fTaskType != null ">and twg.f_task_type = #{fTaskType}</if>
+            <if test="fBillstatus != null  and fBillstatus != ''">and twg.f_billstatus = #{fBillstatus}</if>
+            <if test="fStatus != null  and fStatus != ''">and twg.f_status = #{fStatus}</if>
+            <if test="fBilltype != null  and fBilltype != ''">and twg.f_billtype like concat('%', #{fBilltype}, '%')
+            </if>
+            <if test="fBilltypeName != null  and fBilltypeName != ''">and twg.f_billtype_name like concat('%',
                 #{fBilltypeName}, '%')
             </if>
         </where>
+        ) a,
+        (select @rank:=0) b
     </select>
 
     <select id="selectTWarehouseAgreementList1" parameterType="TWarehouseAgreement"
@@ -253,50 +342,75 @@
 
     <select id="agreementRemind" parameterType="TWarehouseAgreement" resultType="Map">
         select distinct
-            agre.f_id AS fId,
-            agre.f_feetypeid AS fFeetypeid,
-            corp.f_name AS fCorpid,
-            agre.f_contractno AS fContractno,
-            agre.f_begindate AS fBegindate,
-            agre.f_enddate AS fEnddate,
-            agre.create_by AS createBy,
-            agre.create_time AS createTime,
-            agre.remark AS remark
+        agre.f_id AS fId,
+        agre.f_feetypeid AS fFeetypeid,
+        corp.f_name AS fCorpid,
+        agre.f_contractno AS fContractno,
+        agre.f_begindate AS fBegindate,
+        agre.f_enddate AS fEnddate,
+        agre.create_by AS createBy,
+        agre.create_time AS createTime,
+        agre.remark AS remark
         from t_warehouse_agreement agre
         left join t_corps corp on corp.f_id = agre.f_corpid
         where
-            agre.f_status = '0'
-            and datediff(date_format(agre.f_enddate, '%Y-%m-%d'), date_format(now(), '%Y-%m-%d')) &lt;= #{remindDays}
-            <if test="fCorpid != null ">and agre.f_corpid = #{fCorpid}</if>
-            <if test="fContractno != null  and fContractno != ''">and agre.f_contractno = #{fContractno}</if>
-            <if test="fBegindate != null ">and agre.f_begindate = #{fBegindate}</if>
-            <if test="fEnddate != null ">and agre.f_enddate = #{fEnddate}</if>
+        agre.f_status = '0'
+        and datediff(date_format(agre.f_enddate, '%Y-%m-%d'), date_format(now(), '%Y-%m-%d')) &lt;= #{remindDays}
+        <if test="fCorpid != null ">and agre.f_corpid = #{fCorpid}</if>
+        <if test="fContractno != null  and fContractno != ''">and agre.f_contractno = #{fContractno}</if>
+        <if test="fBegindate != null ">and agre.f_begindate = #{fBegindate}</if>
+        <if test="fEnddate != null ">and agre.f_enddate = #{fEnddate}</if>
     </select>
 
     <select id="biContractCount" resultType="map">
         select count(f_id) as contractCount
         from t_warehouse_agreement
         where f_feetypeid = 0
-            <if test="beginDate != null and beginDate != ''">and f_enddate &gt;= #{beginDate}</if>
-            <if test="endDate != null and endDate != ''">and f_enddate &lt; #{endDate}</if>
-            <if test="external != null and external != ''">
-                and f_corpid = (select f_pid from t_customer_contact where f_tel = #{external})
-            </if>
-            <if test="customerId != null">and f_corpid = #{customerId}</if>
+        <if test="beginDate != null and beginDate != ''">and f_enddate &gt;= #{beginDate}</if>
+        <if test="endDate != null and endDate != ''">and f_enddate &lt; #{endDate}</if>
+        <if test="external != null and external != ''">
+            and f_corpid = (select f_pid from t_customer_contact where f_tel = #{external})
+        </if>
+        <if test="customerId != null">and f_corpid = #{customerId}</if>
     </select>
 
     <select id="biContractList" resultType="map">
         select
-            ifnull(tc.f_cname, tc.f_name) as customerName,
-            ta.f_begindate as beginDate,
-            ta.f_enddate as endDate
+        ifnull(tc.f_cname, tc.f_name) as customerName,
+        ta.f_begindate as beginDate,
+        ta.f_enddate as endDate
         from t_warehouse_agreement ta left join t_corps tc on tc.f_id = ta.f_corpid
         where ta.f_feetypeid = 0
-            <if test="external != null and external != ''">
-                and ta.f_corpid = (select f_pid from t_customer_contact where f_tel = #{external})
-            </if>
-            <if test="customerId != null">and ta.f_corpid = #{customerId}</if>
+        <if test="external != null and external != ''">
+            and ta.f_corpid = (select f_pid from t_customer_contact where f_tel = #{external})
+        </if>
+        <if test="customerId != null">and ta.f_corpid = #{customerId}</if>
         order by ta.create_time desc
     </select>
 
+    <select id="selectTGoodsTypeByTypeId" resultType="com.ruoyi.basicData.domain.TGoods">
+        select
+            f_typeid as typeId,
+            f_name as fName
+        from
+            t_goods
+        WHERE
+        f_typeid in
+        <foreach collection="typeIds" item="typeId" open="(" separator="," close=")">
+            #{typeId}
+        </foreach>
+    </select>
+
+    <select id="selectTWarehouseByIds" resultType="com.ruoyi.common.core.domain.entity.TWarehouse">
+        select
+            f_id as fId,
+            f_name as fName
+        from
+            t_warehouse
+        WHERE
+            f_id in
+        <foreach collection="fIds" item="fId" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </select>
 </mapper>

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

@@ -407,6 +407,12 @@
             <if test="fIfdamage != null  and fIfdamage != ''">and bill.f_ifdamage = #{fIfdamage}</if>
             <if test="fBankcorpid != null ">and bill.f_bankcorpid = #{fBankcorpid}</if>
             <if test="fBilltype != null">and bill.f_billtype = #{fBilltype}</if>
+            <if test='timeInterval != null and timeInterval[0] != null and timeInterval[0]!= ""'>
+                and bill.f_bsdate &gt;= #{timeInterval[0]}
+            </if>
+            <if test='timeInterval != null and timeInterval[1] != null and timeInterval[1]!= ""'>
+                and bill.f_bsdate &lt;= #{timeInterval[1]}
+            </if>
             <if test="fBilltype != null  and fBilltype == 'SJRK'">
                 AND dictIn.dict_type = 'st_in_type'
                 AND dictIn.status = '0'