From c9e2d2d342cbce9728bfd5cd5a5ac2de4b15d2d3 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 22 Oct 2025 21:44:34 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E8=B0=83=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreStorageDetailDownloadDTO.java | 48 +++++++++---------- .../StoreProdDemandDownloadDTO.java | 42 ++++++++-------- .../StoreProdStockDownloadDTO.java | 36 +++++++------- .../dto/storeSale/StoreSaleDownloadDTO.java | 22 ++++----- 4 files changed, 74 insertions(+), 74 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreStorageDetailDownloadDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreStorageDetailDownloadDTO.java index 17183f2d7..78aca4217 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreStorageDetailDownloadDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreStorageDetailDownloadDTO.java @@ -17,53 +17,53 @@ import java.util.Date; public class StoreStorageDetailDownloadDTO { - @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC, needMerge = true) + @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC, needMerge = true, height = 28) private Integer orderNum; - @Excel(name = "单据编号", needMerge = true) + @Excel(name = "单据编号", needMerge = true, height = 28) private String code; - @Excel(name = "工厂名称", needMerge = true) + @Excel(name = "工厂名称", needMerge = true, height = 28) private String facName; - @Excel(name = "入库类型", readConverterExp = "1=生产入库,2=其它入库,3=维修入库", needMerge = true) + @Excel(name = "入库类型", readConverterExp = "1=生产入库,2=其它入库,3=维修入库", needMerge = true, height = 28) private Integer storageType; - @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm", needMerge = true) + @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm", needMerge = true, height = 28) private Date createTime; - @Excel(name = "总生产成本") + @Excel(name = "总生产成本", height = 28) private BigDecimal produceAmount; - @Excel(name = "货号") + @Excel(name = "货号", height = 28) private String prodArtNum; - @Excel(name = "颜色") + @Excel(name = "颜色", height = 28) private String colorName; - @Excel(name = "30") + @Excel(name = "30", height = 28) private Integer size30Quantity; - @Excel(name = "31") + @Excel(name = "31", height = 28) private Integer size31Quantity; - @Excel(name = "32") + @Excel(name = "32", height = 28) private Integer size32Quantity; - @Excel(name = "33") + @Excel(name = "33", height = 28) private Integer size33Quantity; - @Excel(name = "34") + @Excel(name = "34", height = 28) private Integer size34Quantity; - @Excel(name = "35") + @Excel(name = "35", height = 28) private Integer size35Quantity; - @Excel(name = "36") + @Excel(name = "36", height = 28) private Integer size36Quantity; - @Excel(name = "37") + @Excel(name = "37", height = 28) private Integer size37Quantity; - @Excel(name = "38") + @Excel(name = "38", height = 28) private Integer size38Quantity; - @Excel(name = "39") + @Excel(name = "39", height = 28) private Integer size39Quantity; - @Excel(name = "40") + @Excel(name = "40", height = 28) private Integer size40Quantity; - @Excel(name = "41") + @Excel(name = "41", height = 28) private Integer size41Quantity; - @Excel(name = "42") + @Excel(name = "42", height = 28) private Integer size42Quantity; - @Excel(name = "43") + @Excel(name = "43", height = 28) private Integer size43Quantity; - @Excel(name = "入库总量") + @Excel(name = "入库总量", height = 28) private Integer totalQuantity; - @Excel(name = "操作人名称") + @Excel(name = "操作人名称", height = 28) private String operatorName; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java index e46b2f94f..82e9eeab9 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java @@ -14,47 +14,47 @@ import lombok.experimental.Accessors; public class StoreProdDemandDownloadDTO { - @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC, needMerge = true) + @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC, needMerge = true, height = 28) private Integer orderNum; - @Excel(name = "货号", needMerge = true) + @Excel(name = "货号", needMerge = true, height = 28) private String prodArtNum; - @Excel(name = "需求单号", needMerge = true) + @Excel(name = "需求单号", needMerge = true, height = 28) private String code; - @Excel(name = "工厂名称", needMerge = true) + @Excel(name = "工厂名称", needMerge = true, height = 28) private String facName; - @Excel(name = "是否紧急单") + @Excel(name = "是否紧急单", height = 28) private String emergency; - @Excel(name = "颜色") + @Excel(name = "颜色", height = 28) private String colorName; - @Excel(name = "30") + @Excel(name = "30", height = 28) private Integer size30Quantity; - @Excel(name = "31") + @Excel(name = "31", height = 28) private Integer size31Quantity; - @Excel(name = "32") + @Excel(name = "32", height = 28) private Integer size32Quantity; - @Excel(name = "33") + @Excel(name = "33", height = 28) private Integer size33Quantity; - @Excel(name = "34") + @Excel(name = "34", height = 28) private Integer size34Quantity; - @Excel(name = "35") + @Excel(name = "35", height = 28) private Integer size35Quantity; - @Excel(name = "36") + @Excel(name = "36", height = 28) private Integer size36Quantity; - @Excel(name = "37") + @Excel(name = "37", height = 28) private Integer size37Quantity; - @Excel(name = "38") + @Excel(name = "38", height = 28) private Integer size38Quantity; - @Excel(name = "39") + @Excel(name = "39", height = 28) private Integer size39Quantity; - @Excel(name = "40") + @Excel(name = "40", height = 28) private Integer size40Quantity; - @Excel(name = "41") + @Excel(name = "41", height = 28) private Integer size41Quantity; - @Excel(name = "42") + @Excel(name = "42", height = 28) private Integer size42Quantity; - @Excel(name = "43") + @Excel(name = "43", height = 28) private Integer size43Quantity; - @Excel(name = "合计") + @Excel(name = "合计", height = 28) private Integer totalQuantity; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockDownloadDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockDownloadDTO.java index 6c223b8a1..dc4568d26 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockDownloadDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockDownloadDTO.java @@ -14,41 +14,41 @@ import lombok.Data; public class StoreProdStockDownloadDTO { - @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC, needMerge = true) + @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC, needMerge = true, height = 28) private Integer orderNum; - @Excel(name = "货号", needMerge = true) + @Excel(name = "货号", needMerge = true, height = 28) private String prodArtNum; - @Excel(name = "颜色") + @Excel(name = "颜色", height = 28) private String colorName; - @Excel(name = "30") + @Excel(name = "30", height = 28) private Integer size30Quantity; - @Excel(name = "31") + @Excel(name = "31", height = 28) private Integer size31Quantity; - @Excel(name = "32") + @Excel(name = "32", height = 28) private Integer size32Quantity; - @Excel(name = "33") + @Excel(name = "33", height = 28) private Integer size33Quantity; - @Excel(name = "34") + @Excel(name = "34", height = 28) private Integer size34Quantity; - @Excel(name = "35") + @Excel(name = "35", height = 28) private Integer size35Quantity; - @Excel(name = "36") + @Excel(name = "36", height = 28) private Integer size36Quantity; - @Excel(name = "37") + @Excel(name = "37", height = 28) private Integer size37Quantity; - @Excel(name = "38") + @Excel(name = "38", height = 28) private Integer size38Quantity; - @Excel(name = "39") + @Excel(name = "39", height = 28) private Integer size39Quantity; - @Excel(name = "40") + @Excel(name = "40", height = 28) private Integer size40Quantity; - @Excel(name = "41") + @Excel(name = "41", height = 28) private Integer size41Quantity; - @Excel(name = "42") + @Excel(name = "42", height = 28) private Integer size42Quantity; - @Excel(name = "43") + @Excel(name = "43", height = 28) private Integer size43Quantity; - @Excel(name = "总库存") + @Excel(name = "总库存", height = 28) private Integer totalQuantity; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDownloadDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDownloadDTO.java index 346572223..c506e25a3 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDownloadDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDownloadDTO.java @@ -17,27 +17,27 @@ import java.util.Date; public class StoreSaleDownloadDTO { - @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC) + @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC, height = 28) private Integer orderNum; - @Excel(name = "单据编号") + @Excel(name = "单据编号", height = 28) private String code; - @Excel(name = "客户") + @Excel(name = "客户", height = 28) private String storeCusName; - @Excel(name = "出库日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm") + @Excel(name = "出库日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm", height = 28) private Date createTime; - @Excel(name = "销售总额") + @Excel(name = "销售总额", height = 28) private BigDecimal amount; - @Excel(name = "销售数量") + @Excel(name = "销售数量", height = 28) private String quantity; - @Excel(name = "抹零金额") + @Excel(name = "抹零金额", height = 28) private BigDecimal roundOff; - @Excel(name = "结款状态", readConverterExp = "1=已结清,2=欠款") + @Excel(name = "结款状态", readConverterExp = "1=已结清,2=欠款", height = 28) private Integer paymentStatus; - @Excel(name = "支付方式", readConverterExp = "1=支付宝,2=微信支付,3=现金,4=欠款") + @Excel(name = "支付方式", readConverterExp = "1=支付宝,2=微信支付,3=现金,4=欠款", height = 28) private Integer payWay; - @Excel(name = "销售类型", readConverterExp = "1=销售,2=退货,3=销售/退货") + @Excel(name = "销售类型", readConverterExp = "1=销售,2=退货,3=销售/退货", height = 28) private Integer saleType; - @Excel(name = "操作人名称") + @Excel(name = "操作人名称", height = 28) private String operatorName; }