From b95b1ae25f0664fe28a6334acc747361b17d1bda Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Fri, 24 Oct 2025 17:18:55 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=BA=93=E5=AD=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=8B=E8=BD=BD=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 | 4 +- .../mapper/StoreProductStockMapper.xml | 56 +++++++++---------- 2 files changed, 30 insertions(+), 30 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 5e2ba9e84..3fa744f63 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 @@ -22,9 +22,9 @@ public class StoreStorageDetailDownloadDTO { private Integer orderNum; @Excel(name = "单据编号", needMerge = true, width = 26, height = 28, headerBackgroundColor = IndexedColors.SKY_BLUE) private String code; - @Excel(name = "工厂名称", needMerge = true, width = 20, height = 28, headerBackgroundColor = IndexedColors.SKY_BLUE) + @Excel(name = "工厂名称", width = 20, height = 28, headerBackgroundColor = IndexedColors.SKY_BLUE) private String facName; - @Excel(name = "入库类型", readConverterExp = "1=生产入库,2=其它入库,3=维修入库", needMerge = true, height = 28, headerBackgroundColor = IndexedColors.SKY_BLUE) + @Excel(name = "入库类型", readConverterExp = "1=生产入库,2=其它入库,3=维修入库", height = 28, headerBackgroundColor = IndexedColors.SKY_BLUE) private Integer storageType; @Excel(name = "入库日期", width = 20, needMerge = true, height = 28, headerBackgroundColor = IndexedColors.SKY_BLUE) private String createTime; diff --git a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml index 326fe4441..5b3f6d4be 100644 --- a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml @@ -98,20 +98,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT sps.prod_art_num, sps.color_name, - sps.size_30 AS size30Quantity, - sps.size_31 AS size31Quantity, - sps.size_32 AS size32Quantity, - sps.size_33 AS size33Quantity, - sps.size_34 AS size34Quantity, - sps.size_35 AS size35Quantity, - sps.size_36 AS size36Quantity, - sps.size_37 AS size37Quantity, - sps.size_38 AS size38Quantity, - sps.size_39 AS size39Quantity, - sps.size_40 AS size40Quantity, - sps.size_41 AS size41Quantity, - sps.size_42 AS size42Quantity, - sps.size_43 AS size43Quantity, + NULLIF(sps.size_30, 0) AS size30Quantity, + NULLIF(sps.size_31, 0) AS size31Quantity, + NULLIF(sps.size_32, 0) AS size32Quantity, + NULLIF(sps.size_33, 0) AS size33Quantity, + NULLIF(sps.size_34, 0) AS size34Quantity, + NULLIF(sps.size_35, 0) AS size35Quantity, + NULLIF(sps.size_36, 0) AS size36Quantity, + NULLIF(sps.size_37, 0) AS size37Quantity, + NULLIF(sps.size_38, 0) AS size38Quantity, + NULLIF(sps.size_39, 0) AS size39Quantity, + NULLIF(sps.size_40, 0) AS size40Quantity, + NULLIF(sps.size_41, 0) AS size41Quantity, + NULLIF(sps.size_42, 0) AS size42Quantity, + NULLIF(sps.size_43, 0) AS size43Quantity COALESCE ( sps.size_30, 0 ) + COALESCE ( sps.size_31, 0 ) + COALESCE ( sps.size_32, 0 ) + COALESCE ( sps.size_33, 0 ) + COALESCE ( sps.size_34, 0 ) + COALESCE ( sps.size_35, 0 ) + COALESCE ( sps.size_36, 0 ) + COALESCE ( sps.size_37, 0 ) + COALESCE ( sps.size_38, 0 ) + COALESCE ( sps.size_39, 0 ) + COALESCE ( sps.size_40, 0 ) + COALESCE ( sps.size_41, 0 ) + COALESCE ( sps.size_42, 0 ) + COALESCE ( sps.size_43, 0 ) AS totalQuantity @@ -132,20 +132,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT sps.prod_art_num, sps.color_name, - sps.size_30 AS size30Quantity, - sps.size_31 AS size31Quantity, - sps.size_32 AS size32Quantity, - sps.size_33 AS size33Quantity, - sps.size_34 AS size34Quantity, - sps.size_35 AS size35Quantity, - sps.size_36 AS size36Quantity, - sps.size_37 AS size37Quantity, - sps.size_38 AS size38Quantity, - sps.size_39 AS size39Quantity, - sps.size_40 AS size40Quantity, - sps.size_41 AS size41Quantity, - sps.size_42 AS size42Quantity, - sps.size_43 AS size43Quantity, + NULLIF(sps.size_30, 0) AS size30Quantity, + NULLIF(sps.size_31, 0) AS size31Quantity, + NULLIF(sps.size_32, 0) AS size32Quantity, + NULLIF(sps.size_33, 0) AS size33Quantity, + NULLIF(sps.size_34, 0) AS size34Quantity, + NULLIF(sps.size_35, 0) AS size35Quantity, + NULLIF(sps.size_36, 0) AS size36Quantity, + NULLIF(sps.size_37, 0) AS size37Quantity, + NULLIF(sps.size_38, 0) AS size38Quantity, + NULLIF(sps.size_39, 0) AS size39Quantity, + NULLIF(sps.size_40, 0) AS size40Quantity, + NULLIF(sps.size_41, 0) AS size41Quantity, + NULLIF(sps.size_42, 0) AS size42Quantity, + NULLIF(sps.size_43, 0) AS size43Quantity COALESCE ( sps.size_30, 0 ) + COALESCE ( sps.size_31, 0 ) + COALESCE ( sps.size_32, 0 ) + COALESCE ( sps.size_33, 0 ) + COALESCE ( sps.size_34, 0 ) + COALESCE ( sps.size_35, 0 ) + COALESCE ( sps.size_36, 0 ) + COALESCE ( sps.size_37, 0 ) + COALESCE ( sps.size_38, 0 ) + COALESCE ( sps.size_39, 0 ) + COALESCE ( sps.size_40, 0 ) + COALESCE ( sps.size_41, 0 ) + COALESCE ( sps.size_42, 0 ) + COALESCE ( sps.size_43, 0 ) AS totalQuantity