[CODE]: 导出文件名修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -42,11 +42,12 @@ public class CommonController
     {
         try
         {
-            if (!FileUtils.checkAllowDownload(fileName))
+            /*if (!FileUtils.checkAllowDownload(fileName))
             {
                 throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
             }
-            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);*/
+            String realFileName = fileName;
             String filePath = RuoYiConfig.getDownloadPath() + fileName;
 
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);

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

@@ -158,7 +158,8 @@ public class TContrastController extends BaseController {
     @GetMapping("/exportItems/{fId}")
     public AjaxResult exportItems(@PathVariable("fId") Long fId) {
         List<TWareHouseExcelItem> list = tFeeService.selectTWarehousebillsItemsList(fId);
+        String exportName = tFeeService.findCtrlcorpid(fId);
         ExcelUtil<TWareHouseExcelItem> util = new ExcelUtil<TWareHouseExcelItem>(TWareHouseExcelItem.class);
-        return util.exportExcel(list, "warehousebills");
+        return util.exportExcel(list, exportName);
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -816,7 +816,8 @@ public class ExcelUtil<T>
      */
     public String encodingFilename(String filename)
     {
-        filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
+       // filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
+        filename =  filename + ".xlsx";
         return filename;
     }
 

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

@@ -30,10 +30,22 @@ public class TWareHouseExcelItem {
     @Excel(name = "品牌")
     private String fMarks;
 
+    /**
+     * 计价单位(数据字典),对应，t_unitfees f_id，如果选择为毛重，数量（f_qty）取主表的毛重，如果选择净重，取主表的净重，如果为箱量，取主表的箱量
+     */
+    @Excel(name = "计价单位")
+    private String fFeeunitid;
+
     /** 重量 */
-    @Excel(name = "重量")
+    @Excel(name = "数量")
     private BigDecimal fBillingQty;
 
+    /**
+     * 单价
+     */
+    @Excel(name = "单价")
+    private BigDecimal fUnitprice;
+
     /** 业务日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -174,6 +186,22 @@ public class TWareHouseExcelItem {
         this.fAmt2 = fAmt2;
     }
 
+    public String getfFeeunitid() {
+        return fFeeunitid;
+    }
+
+    public void setfFeeunitid(String fFeeunitid) {
+        this.fFeeunitid = fFeeunitid;
+    }
+
+    public BigDecimal getfUnitprice() {
+        return fUnitprice;
+    }
+
+    public void setfUnitprice(BigDecimal fUnitprice) {
+        this.fUnitprice = fUnitprice;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

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

@@ -82,4 +82,6 @@ public interface TWarehousebillsitemsMapper extends BaseMapper<TWarehousebillsit
      * @return 结果
      */
     int warehouseItemFollowUpdate(@Param("fPid") Long fPid, @Param("fettle") Long fettle);
+
+    int warehousebillsitemsWarehouselocidSize(@Param("fWarehouselocid") Long fPid);
 }