From 95a8ec5cd2d23664469435c0b0b14e149d63d686 Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Thu, 25 Jun 2026 15:42:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=AF=BC=E5=87=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StGoodsClassController.java | 3 +- .../wms/controller/StGoodsExtController.java | 2 +- .../wms/excel/StGoodsClassExcel.java | 18 ----- .../wms/excel/StGoodsExtExcel.java | 46 ++++++------- .../wms/mapper/StGoodsExtMapper.java | 6 +- .../wms/mapper/StGoodsExtMapper.xml | 66 ++++++++++++++++++- .../service/impl/StGoodsExtServiceImpl.java | 16 +++-- 7 files changed, 106 insertions(+), 51 deletions(-) diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsClassController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsClassController.java index 3bfa82a13..563c16d05 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsClassController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsClassController.java @@ -17,6 +17,7 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.wms.excel.StGoodsClassExcel; @@ -190,7 +191,7 @@ public class StGoodsClassController extends BladeController { //if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(StGoodsClass::getTenantId, bladeUser.getTenantId()); //} - //queryWrapper.lambda().eq(StGoodsClassEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + queryWrapper.lambda().eq(StGoodsClass::getIsDeleted, BladeConstant.DB_NOT_DELETED); List list = stGoodsClassService.exportStGoodsClass(queryWrapper); ExcelUtil.export(response, "物料类别表数据" + DateUtil.time(), "物料类别表数据表", list, StGoodsClassExcel.class); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java index 9f5e22f2b..5a67d24f4 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java @@ -129,7 +129,7 @@ public class StGoodsExtController extends BladeController { // queryWrapper.lambda().eq(StGoodsExt::getTenantId, bladeUser.getTenantId()); //} //queryWrapper.lambda().eq(StGoodsExtEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = stGoodsExtService.exportStGoodsExt(queryWrapper); + List list = stGoodsExtService.exportStGoodsExt(stGoodsExt); ExcelUtil.export(response, "物料状态表数据" + DateUtil.time(), "物料状态表数据表", list, StGoodsExtExcel.class); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsClassExcel.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsClassExcel.java index c415e77a5..feec6b335 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsClassExcel.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsClassExcel.java @@ -27,24 +27,6 @@ public class StGoodsClassExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * 主键 - */ - @ColumnWidth(20) - @ExcelProperty("主键") - private Long id; - /** - * 租户ID（默认值：000000） - */ - @ColumnWidth(20) - @ExcelProperty("租户ID（默认值：000000）") - private String tenantId; - /** - * 是否已删除（默认值：0） - */ - @ColumnWidth(20) - @ExcelProperty("是否已删除（默认值：0）") - private Long isDeleted; /** * 类别编码 */ diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsExtExcel.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsExtExcel.java index 5864a3e94..60f90659e 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsExtExcel.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StGoodsExtExcel.java @@ -28,29 +28,35 @@ public class StGoodsExtExcel implements Serializable { private static final long serialVersionUID = 1L; /** - * 主键 + * 物料编码 */ @ColumnWidth(20) - @ExcelProperty("主键") - private Long id; + @ExcelProperty("物料编码") + private String goodsCode; /** - * 租户ID（默认值：000000） + * 物料名称 */ @ColumnWidth(20) - @ExcelProperty("租户ID（默认值：000000）") - private String tenantId; + @ExcelProperty("物料名称") + private String goodsName; /** - * 是否已删除（默认值：0） + * 型号/牌号 */ @ColumnWidth(20) - @ExcelProperty("是否已删除（默认值：0）") - private Long isDeleted; + @ExcelProperty("型号/牌号") + private String materialModel; + /** + * 物料规格 + */ + @ColumnWidth(20) + @ExcelProperty("物料规格") + private String specifications; /** * 季度月使用量均值 */ @ColumnWidth(20) @ExcelProperty("季度月使用量均值") - private Long useAverage; + private Double useAverage; /** * 一级库存 */ @@ -74,36 +80,30 @@ public class StGoodsExtExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("是否油漆") - private Boolean paint; + private String paintName; /** * 周转工 */ @ColumnWidth(20) @ExcelProperty("周转工") - private Long turnover; + private String turnoverName; /** * 是否配送 */ @ColumnWidth(20) @ExcelProperty("是否配送") - private Boolean delivery; + private String deliveryName; /** - * 是否特殊;默认 false + * 是否特殊 */ @ColumnWidth(20) - @ExcelProperty("是否特殊;默认 false") - private Boolean special; + @ExcelProperty("是否特殊") + private String specialName; /** * 物料状态 */ @ColumnWidth(20) @ExcelProperty("物料状态") - private Long goodsStatus; - /** - * 物料信息ID（关联st_goods表） - */ - @ColumnWidth(20) - @ExcelProperty("物料信息ID（关联st_goods表）") - private Long goodsId; + private String goodsStatusName; } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.java index ad90261ae..4602db90d 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.java @@ -1,6 +1,5 @@ package org.springblade.wms.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -10,6 +9,7 @@ import org.springblade.wms.pojo.entity.StGoodsExt; import org.springblade.wms.pojo.vo.StGoodsExtVO; import java.util.List; +import java.util.Map; /** * @version 1.0 @@ -38,7 +38,7 @@ public interface StGoodsExtMapper extends BaseMapper { * @param queryWrapper 查询条件 * @return List */ - List exportStGoodsExt(@Param("ew") Wrapper queryWrapper); +// List exportStGoodsExt(@Param("ew") Wrapper queryWrapper); IPage selectGoodsExtWithGoods(IPage page, @Param("ew") QueryWrapper queryWrapper); @@ -47,5 +47,7 @@ public interface StGoodsExtMapper extends BaseMapper { StGoodsExt selectWithAvgMonth(Long goodsId); Double getPlanQty(Long goodsId); + + List exportStGoodsExt(Map stGoodsExt); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml index a396a7c03..22b167585 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml @@ -115,7 +115,71 @@