From 9b508c858da456ae8b6454d24c671243bdb874f9 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sun, 19 Oct 2025 21:33:50 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=85=A5=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AF=BC=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 --- .../storeProductDemand/StoreProdDemandDownloadDTO.java | 2 ++ .../service/impl/StoreProductDemandServiceImpl.java | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) 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 87ccee6d6..39e506e07 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 @@ -18,6 +18,8 @@ public class StoreProdDemandDownloadDTO { private Integer orderNum; @Excel(name = "货号", needMerge = true) private String prodArtNum; + @Excel(name = "是否紧急单", needMerge = true) + private String emergency; @Excel(name = "颜色", needMerge = true) private String colorName; @Excel(name = "30") diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java index 3ac5f9fa3..e4fca333a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java @@ -408,10 +408,12 @@ public class StoreProductDemandServiceImpl implements IStoreProductDemandService List demandDetailList = this.storeProdDemandDetailMapper.selectList(queryWrapper); List downLoadList = demandDetailList.stream().sorted(Comparator.comparing(StoreProductDemandDetail::getProdArtNum)) .map(x -> new StoreProdDemandDownloadDTO() - .setProdArtNum(x.getProdArtNum()).setColorName(x.getColorName()).setSize30Quantity(x.getSize30()).setSize31Quantity(x.getSize31()) - .setSize32Quantity(x.getSize32()).setSize33Quantity(x.getSize33()).setSize34Quantity(x.getSize34()).setSize35Quantity(x.getSize35()) - .setSize36Quantity(x.getSize36()).setSize37Quantity(x.getSize37()).setSize38Quantity(x.getSize38()).setSize39Quantity(x.getSize39()) - .setSize40Quantity(x.getSize40()).setSize41Quantity(x.getSize41()).setSize42Quantity(x.getSize42()).setSize43Quantity(x.getSize43()) + .setProdArtNum(x.getProdArtNum()).setColorName(x.getColorName()).setEmergency(Objects.equals(x.getEmergency(), 0) ? "正常单" : "紧急单") + .setSize30Quantity(x.getSize30()).setSize31Quantity(x.getSize31()).setSize32Quantity(x.getSize32()) + .setSize33Quantity(x.getSize33()).setSize34Quantity(x.getSize34()).setSize35Quantity(x.getSize35()) + .setSize36Quantity(x.getSize36()).setSize37Quantity(x.getSize37()).setSize38Quantity(x.getSize38()) + .setSize39Quantity(x.getSize39()).setSize40Quantity(x.getSize40()).setSize41Quantity(x.getSize41()) + .setSize42Quantity(x.getSize42()).setSize43Quantity(x.getSize43()) .setTotalQuantity(ObjectUtils.defaultIfNull(x.getSize30(), 0) + ObjectUtils.defaultIfNull(x.getSize31(), 0) + ObjectUtils.defaultIfNull(x.getSize32(), 0) +