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 9e4800dab..17183f2d7 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 @@ -25,13 +25,13 @@ public class StoreStorageDetailDownloadDTO { private String facName; @Excel(name = "入库类型", readConverterExp = "1=生产入库,2=其它入库,3=维修入库", needMerge = true) private Integer storageType; - @Excel(name = "出库日期", width = 30, dateFormat = "yyyy-MM-dd", needMerge = true) + @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm", needMerge = true) private Date createTime; - @Excel(name = "总生产成本", needMerge = true) + @Excel(name = "总生产成本") private BigDecimal produceAmount; - @Excel(name = "货号", needMerge = true) + @Excel(name = "货号") private String prodArtNum; - @Excel(name = "颜色", needMerge = true) + @Excel(name = "颜色") private String colorName; @Excel(name = "30") private Integer size30Quantity; 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 929533e94..e46b2f94f 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 @@ -24,7 +24,7 @@ public class StoreProdDemandDownloadDTO { private String facName; @Excel(name = "是否紧急单") private String emergency; - @Excel(name = "颜色", needMerge = true) + @Excel(name = "颜色") private String colorName; @Excel(name = "30") private Integer size30Quantity; 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 314cf3802..6c223b8a1 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 @@ -18,7 +18,7 @@ public class StoreProdStockDownloadDTO { private Integer orderNum; @Excel(name = "货号", needMerge = true) private String prodArtNum; - @Excel(name = "颜色", needMerge = true) + @Excel(name = "颜色") private String colorName; @Excel(name = "30") private Integer size30Quantity; 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 02e5aeb17..d94764631 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 @@ -23,7 +23,7 @@ public class StoreSaleDownloadDTO { private String code; @Excel(name = "客户") private String storeCusName; - @Excel(name = "出库日期", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "出库日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm") private Date voucherDate; @Excel(name = "销售总额") private BigDecimal amount;