From 6f559a23dbee82da9c3f5137c52d00c109473056 Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Fri, 26 Jun 2026 16:25:59 +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/StRequisitionController.java | 29 +-- .../wms/excel/StRequisitionExcel.java | 166 +++--------------- .../wms/mapper/StRequisitionMapper.java | 7 +- .../wms/mapper/StRequisitionMapper.xml | 23 ++- .../wms/service/IStRequisitionService.java | 5 +- .../impl/StRequisitionServiceImpl.java | 48 +++-- 6 files changed, 90 insertions(+), 188 deletions(-) diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRequisitionController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRequisitionController.java index ec5c3acb5..f8cfacfaf 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRequisitionController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRequisitionController.java @@ -11,6 +11,7 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.log.annotation.ApiLog; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.Condition; @@ -19,7 +20,9 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.wms.excel.StRequisitionExcel; import org.springblade.wms.pojo.dto.StRequisitionDTO; import org.springblade.wms.pojo.entity.StRequisition; import org.springblade.wms.pojo.entity.StStorageLocation; @@ -246,19 +249,19 @@ public class StRequisitionController extends BladeController { /** * 导出数据 */ -// @IsAdmin -//// @GetMapping("/export-stRequisition") -//// @ApiOperationSupport(order = 9) -//// @Operation(summary = "导出数据", description = "传入stRequisition") -//// public void exportStRequisition(@Parameter(hidden = true) @RequestParam Map stRequisition, BladeUser bladeUser, HttpServletResponse response) { -//// QueryWrapper queryWrapper = Condition.getQueryWrapper(stRequisition, StRequisition.class); -//// //if (!AuthUtil.isAdministrator()) { -//// // queryWrapper.lambda().eq(StRequisition::getTenantId, bladeUser.getTenantId()); -//// //} -// //queryWrapper.lambda().eq(StRequisitionEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); -// List list = stRequisitionService.exportStRequisition(queryWrapper); -// ExcelUtil.export(response, "领料单打印数据" + DateUtil.time(), "领料单打印数据表", list, StRequisitionExcel.class); -// } + @IsAdmin + @GetMapping("/export-stRequisition") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入stRequisition") + public void exportStRequisition(@Parameter(hidden = true) @RequestParam Map stRequisition, BladeUser bladeUser, HttpServletResponse response) { +// QueryWrapper queryWrapper = Condition.getQueryWrapper(stRequisition, StRequisition.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(StRequisition::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(StRequisitionEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = stRequisitionService.exportStRequisition(stRequisition); + ExcelUtil.export(response, "领料单打印数据" + DateUtil.time(), "领料单打印数据表", list, StRequisitionExcel.class); + } } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StRequisitionExcel.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StRequisitionExcel.java index 682c1ffc6..ee755ce96 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StRequisitionExcel.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StRequisitionExcel.java @@ -28,47 +28,23 @@ public class StRequisitionExcel implements Serializable { private static final long serialVersionUID = 1L; /** - * 主键 + * 物料编号 */ @ColumnWidth(20) - @ExcelProperty("主键") - private Long id; - /** - * 租户ID - */ - @ColumnWidth(20) - @ExcelProperty("租户ID") - private String tenantId; - /** - * 是否已删除 - */ - @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Long isDeleted; - /** - * 采购单号 - */ - @ColumnWidth(20) - @ExcelProperty("采购单号") - private String buyCode; - /** - * 出库单号 - */ - @ColumnWidth(20) - @ExcelProperty("出库单号") - private String invadjCode; + @ExcelProperty("物料编号") + private String prtno; /** - * 到期日期 + * 材料名称 */ @ColumnWidth(20) - @ExcelProperty("到期日期") - private String validdat; + @ExcelProperty("材料名称") + private String prtdesc; /** - * 领用单位/需求部门 + * 规格 */ @ColumnWidth(20) - @ExcelProperty("领用单位/需求部门") - private String splyName; + @ExcelProperty("规格") + private String prtinfo; /** * 生产标识 */ @@ -76,29 +52,23 @@ public class StRequisitionExcel implements Serializable { @ExcelProperty("生产标识") private String prtlotno; /** - * 请领日期 - */ - @ColumnWidth(20) - @ExcelProperty("请领日期") - private String enrtydate; - /** - * 材料编号;1、新建；3、已提交，5、采购中；7、已跟踪；9、已到料 + * 出库单号 */ @ColumnWidth(20) - @ExcelProperty("材料编号;1、新建；3、已提交，5、采购中；7、已跟踪；9、已到料") - private String prtno; + @ExcelProperty("出库单号") + private String invadjCode; /** - * 材料名称 + * 出库数量 */ @ColumnWidth(20) - @ExcelProperty("材料名称") - private String prtdesc; + @ExcelProperty("出库数量") + private String invysqty; /** - * 牌号/规格/状态 + * 单价 */ @ColumnWidth(20) - @ExcelProperty("牌号/规格/状态") - private String prtinfo; + @ExcelProperty("单价") + private Double invadjMoney; /** * 单位 */ @@ -106,107 +76,17 @@ public class StRequisitionExcel implements Serializable { @ExcelProperty("单位") private String prtum; /** - * 总数量;外键（人员） - */ - @ColumnWidth(20) - @ExcelProperty("总数量;外键（人员）") - private String invysqty; - /** - * 代料单号 + * 到期日期 */ @ColumnWidth(20) - @ExcelProperty("代料单号") - private String prtrepno; + @ExcelProperty("到期日期") + private String validdat; /** - * 检验编号;外键（部门） + * 检验编号 */ @ColumnWidth(20) - @ExcelProperty("检验编号;外键（部门）") + @ExcelProperty("检验编号") private String qutno; - /** - * 计划区域 - */ - @ColumnWidth(20) - @ExcelProperty("计划区域") - private String plnarea; - /** - * 保管员 - */ - @ColumnWidth(20) - @ExcelProperty("保管员") - private String warctlr; - /** - * 库房区域 - */ - @ColumnWidth(20) - @ExcelProperty("库房区域") - private String storarea; - /** - * 发货仓库 - */ - @ColumnWidth(20) - @ExcelProperty("发货仓库") - private String warno; - /** - * 库位号 - */ - @ColumnWidth(20) - @ExcelProperty("库位号") - private String warlocno; - /** - * 路线卡号 - */ - @ColumnWidth(20) - @ExcelProperty("路线卡号") - private String rouclp; - /** - * 备注 - */ - @ColumnWidth(20) - @ExcelProperty("备注") - private String remark; - /** - * 领料到期日期 - */ - @ColumnWidth(20) - @ExcelProperty("领料到期日期") - private String inviefdat; - /** - * 当前状态，待打印-1，已打印待入库0，已入库10 - */ - @ColumnWidth(20) - @ExcelProperty("当前状态，待打印-1，已打印待入库0，已入库10") - private Long curStatus; - /** - * 金额 - */ - @ColumnWidth(20) - @ExcelProperty("金额") - private Double invadjMoney; - /** - * 计划申报人 - */ - @ColumnWidth(20) - @ExcelProperty("计划申报人") - private String planDeclareMan; - /** - * 采购部计划员 - */ - @ColumnWidth(20) - @ExcelProperty("采购部计划员") - private String planBuyMan; - /** - * 炉批号 - */ - @ColumnWidth(20) - @ExcelProperty("炉批号") - private String stovePiNo; - /** - * 批号 - */ - @ColumnWidth(20) - @ExcelProperty("批号") - private String piNo; public void setBrCode(String invadjCode) { } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRequisitionMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRequisitionMapper.java index 62da69581..78174bcdc 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRequisitionMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRequisitionMapper.java @@ -1,14 +1,13 @@ package org.springblade.wms.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; import org.springblade.wms.excel.StRequisitionExcel; import org.springblade.wms.pojo.entity.StRequisition; import org.springblade.wms.pojo.vo.StRequisitionVO; import java.util.List; +import java.util.Map; /** * @version 1.0 @@ -37,7 +36,9 @@ public interface StRequisitionMapper extends BaseMapper { * @param queryWrapper 查询条件 * @return List */ - List exportStRequisition(@Param("ew") Wrapper queryWrapper); +// List exportStRequisition(@Param("ew") Wrapper queryWrapper); List selectWaitPushPage(IPage page, StRequisitionVO stRequisition); + + List exportStRequisition(Map stRequisition); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRequisitionMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRequisitionMapper.xml index 216c288c7..53538de5a 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRequisitionMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRequisitionMapper.xml @@ -136,7 +136,28 @@ diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStRequisitionService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStRequisitionService.java index 657ae1e1d..0216fc0fe 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStRequisitionService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStRequisitionService.java @@ -1,6 +1,5 @@ package org.springblade.wms.service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.servlet.http.HttpServletResponse; @@ -41,7 +40,7 @@ public interface IStRequisitionService extends BaseService { * @param queryWrapper 查询条件 * @return List */ - List exportStRequisition(Wrapper queryWrapper); +// List exportStRequisition(Wrapper queryWrapper); List assembleExportData(QueryWrapper queryWrapper, String printType); @@ -52,5 +51,7 @@ public interface IStRequisitionService extends BaseService { void pushWarehose(List list, BladeUser user); Map getBarCode(Long srId); + + List exportStRequisition(Map stRequisition); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRequisitionServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRequisitionServiceImpl.java index eb5ec8d73..76cb5c732 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRequisitionServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRequisitionServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -122,26 +121,26 @@ public class StRequisitionServiceImpl extends BaseServiceImpl exportStRequisition(Wrapper queryWrapper) { - List stRequisitionList = baseMapper.exportStRequisition(queryWrapper); - //stRequisitionList.forEach(stRequisition -> { - // stRequisition.setTypeName(DictCache.getValue(DictEnum.YES_NO, StRequisition.getType())); - //}); + public List exportStRequisition(Map stRequisition) { + List stRequisitionList = baseMapper.exportStRequisition(stRequisition); return stRequisitionList; }