Merge remote-tracking branch 'origin/master'

1 day ago · cb9582261f
parent 78102b469d 08796694b6
commit cb9582261f
12 changed files with 193 additions and 270 deletions
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StErpWarehouseTransferController.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StErpWarehouseTransferController.java
@ -195,12 +195,12 @@ public class StErpWarehouseTransferController extends BladeController {
 	@ApiLog("导出数据")
 	@Operation(summary = "导出数据", description  = "传入stErpWarehouseTransfer")
 	public void exportStErpWarehouseTransfer(@Parameter(hidden = true) @RequestParam Map<String, Object> stErpWarehouseTransfer, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<StErpWarehouseTransfer> queryWrapper = Condition.getQueryWrapper(stErpWarehouseTransfer, StErpWarehouseTransfer.class);
+//		QueryWrapper<StErpWarehouseTransfer> queryWrapper = Condition.getQueryWrapper(stErpWarehouseTransfer, StErpWarehouseTransfer.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(StErpWarehouseTransfer::getTenantId, bladeUser.getTenantId());
 		//}
 		//queryWrapper.lambda().eq(StErpWarehouseTransferEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<StErpWarehouseTransferExcel> list = stErpWarehouseTransferService.exportStErpWarehouseTransfer(queryWrapper);
+		List<StErpWarehouseTransferExcel> list = stErpWarehouseTransferService.exportStErpWarehouseTransfer(stErpWarehouseTransfer);
 		ExcelUtil.export(response, "ERP库转移记录表数据" + DateUtil.time(), "ERP库转移记录表数据表", list, StErpWarehouseTransferExcel.class);
 	}

--- 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;
@ -201,7 +204,7 @@ public class StRequisitionController extends BladeController {
 	 * 领料单打印
 	 */
 	@IsAdmin
-	@GetMapping("/export-stRequisition")
+	@GetMapping("/export")
 	@ApiOperationSupport(order = 11)
 	@Operation(summary = "导出/打印领料单数据", description = "传入idList、exportType，支持基础打印")
 	public void exportStRequisition(
@ -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<String, Object> stRequisition, BladeUser bladeUser, HttpServletResponse response) {
-////		QueryWrapper<StRequisition> 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<StRequisitionExcel> 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<String, Object> stRequisition, BladeUser bladeUser, HttpServletResponse response) {
+//		QueryWrapper<StRequisition> 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<StRequisitionExcel> list = stRequisitionService.exportStRequisition(stRequisition);
+		ExcelUtil.export(response, "领料单打印数据" + DateUtil.time(), "领料单打印数据表", list, StRequisitionExcel.class);
+	}

 }

--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StErpWarehouseTransferExcel.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StErpWarehouseTransferExcel.java
@ -28,30 +28,6 @@ public class StErpWarehouseTransferExcel 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;
-	/**
-	 * 物料编号（关联st_goods表主键）
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("物料编号（关联st_goods表主键）")
-	private Long goodsId;
 	/**
 	 * 出库单号
 	 */
@ -59,95 +35,95 @@ public class StErpWarehouseTransferExcel implements Serializable {
 	@ExcelProperty("出库单号")
 	private String outCode;
 	/**
-	 * 出库数量
+	 * 材料编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("出库数量")
-	private Double outQuantity;
+	@ExcelProperty("材料编号")
+	private String goodsCode;
 	/**
-	 * 出库仓库
+	 * 出库数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("出库仓库")
-	private String outWarehouse;
+	@ExcelProperty("出库数量")
+	private Double outQuantity;
 	/**
-	 * 库房库位
+	 * 出库人
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("库房库位")
-	private String outLocation;
+	@ExcelProperty("出库人")
+	private String checkUser;
 	/**
-	 * 检验编号
+	 * 入库数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("检验编号")
-	private String checkCode;
+	@ExcelProperty("入库数量")
+	private Double putQuantity;
 	/**
-	 * 批次号
+	 * 入库仓库
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("批次号")
-	private String batchCode;
+	@ExcelProperty("入库仓库")
+	private String shName;
 	/**
-	 * 单价
+	 * 入库库位
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("单价")
-	private Double unitPrice;
+	@ExcelProperty("入库库位")
+	private String location;
 	/**
-	 * 出库人
+	 * 材料名称
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("出库人")
-	private String checkUser;
+	@ExcelProperty("材料名称")
+	private String goodsName;
 	/**
-	 * 入库数量
+	 * 物料规格
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("入库数量")
-	private Double putQuantity;
+	@ExcelProperty("物料规格")
+	private String specifications;
 	/**
-	 * 质量等级
+	 * 型号/牌号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("质量等级")
-	private String quantityLevel;
+	@ExcelProperty("型号/牌号")
+	private String materialModel;
 	/**
-	 * 报废日期
+	 * 单位
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("报废日期")
-	private Date scrapCycle;
+	@ExcelProperty("单位")
+	private String unitName;
 	/**
-	 * erp入库日期
+	 * 批次号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("erp入库日期")
-	private Date warehousingDate;
+	@ExcelProperty("批次号")
+	private String batchCode;
 	/**
-	 * 条码号
+	 * 炉批号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("条码号")
-	private String barCode;
+	@ExcelProperty("炉批号")
+	private String prtWoCode;
 	/**
-	 * 分厂id，热表102，模塑5
+	 * 单价
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("分厂id，热表102，模塑5")
-	private Long deptId;
+	@ExcelProperty("单价")
+	private Double unitPrice;
 	/**
-	 * 炉批号
+	 * 检验编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("炉批号")
-	private String prtWoCode;
+	@ExcelProperty("检验编号")
+	private String checkCode;
 	/**
-	 * 供方代码
+	 * 到期日期
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("供方代码")
-	private String splyCode;
+	@ExcelProperty("到期日期")
+	private Date scrapCycle;

 }

--- 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) {
 	}
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StErpWarehouseTransferMapper.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StErpWarehouseTransferMapper.java
@ -1,6 +1,5 @@
 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;
@ -9,6 +8,7 @@ import org.springblade.wms.pojo.entity.StErpWarehouseTransfer;
 import org.springblade.wms.pojo.vo.StErpWarehouseTransferVO;

 import java.util.List;
+import java.util.Map;

 /**
 * @version 1.0
@ -30,6 +30,8 @@ public interface StErpWarehouseTransferMapper extends BaseMapper<StErpWarehouseT
 	 */
 	List<StErpWarehouseTransferVO> selectStErpWarehouseTransferPage(IPage page, StErpWarehouseTransferVO stErpWarehouseTransfer);

+	List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(@Param("stErpWarehouseTransfer") Map<String, Object> stErpWarehouseTransfer);
+

 	/**
 	 * 获取导出数据
@ -37,7 +39,7 @@ public interface StErpWarehouseTransferMapper extends BaseMapper<StErpWarehouseT
 	 * @param queryWrapper 查询条件
 	 * @return List<StErpWarehouseTransferExcel>
 	 */
-	List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(@Param("ew") Wrapper<StErpWarehouseTransfer> queryWrapper);
+//	List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(@Param("ew") Wrapper<StErpWarehouseTransfer> queryWrapper);

 }

--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StErpWarehouseTransferMapper.xml
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StErpWarehouseTransferMapper.xml
@ -96,7 +96,50 @@


    <select id="exportStErpWarehouseTransfer" resultType="org.springblade.wms.excel.StErpWarehouseTransferExcel">
-        SELECT * FROM ST_ERP_WAREHOUSE_TRANSFER ${ew.customSqlSegment}
+        SELECT
+        transfer.*,
+        -- 关联ST_GOODS物料表：补充原表没有的物料相关字段
+        g.goods_code ,       -- 材料编号（物料表编码）
+        g.goods_name ,       -- 材料名称（物料表名称）
+        g.specifications ,   -- 物料规格（物料表规格）
+        g.material_model ,           -- 型号/牌号（物料表型号）
+        g.unit_name,                -- 单位（物料表计量单位）
+        s.sh_id,
+        s.sh_name,
+        s.id AS slId,
+        s.location,
+        (transfer.out_quantity - transfer.put_quantity) AS remainQuantity
+        FROM st_erp_warehouse_transfer transfer
+        -- 左关联物料表：保证无物料ID时，转移记录仍能查询
+        LEFT JOIN st_goods g ON transfer.goods_id = g.id AND g.is_deleted = 0
+        <where>
+            (transfer.out_quantity - transfer.put_quantity) > 0
+            <!-- 1. 出库单号：原表outCode模糊查询 -->
+            <if test="stErpWarehouseTransfer.outCode != null and stErpWarehouseTransfer.outCode != ''">
+                AND transfer.out_code LIKE '%' || #{stErpWarehouseTransfer.outCode} || '%'
+            </if>
+
+            <!-- 2. 材料编号：关联物料表goods_code模糊查询 -->
+            <if test="stErpWarehouseTransfer.goodsCode != null and stErpWarehouseTransfer.goodsCode != ''">
+                AND g.goods_code LIKE '%' || #{stErpWarehouseTransfer.goodsCode} || '%'
+            </if>
+
+            <!-- 3. 材料名称：关联物料表goods_name模糊查询 -->
+            <if test="stErpWarehouseTransfer.goodsName != null and stErpWarehouseTransfer.goodsName != ''">
+                AND g.goods_name LIKE '%' || #{stErpWarehouseTransfer.goodsName} || '%'
+            </if>
+
+            <!-- 4. 批次号：原表batchCode模糊查询 -->
+            <if test="stErpWarehouseTransfer.batchCode != null and stErpWarehouseTransfer.batchCode != ''">
+                AND transfer.batch_code LIKE '%' || #{stErpWarehouseTransfer.batchCode} || '%'
+            </if>
+
+            <!-- 5. 检验编号：原表checkCode模糊查询 -->
+            <if test="stErpWarehouseTransfer.checkCode != null and stErpWarehouseTransfer.checkCode != ''">
+                AND transfer.check_code LIKE '%' || #{stErpWarehouseTransfer.checkCode} || '%'
+            </if>
+        </where>
+        ORDER BY transfer.create_time DESC
    </select>

 </mapper>
--- 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,6 +1,5 @@
 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;
@ -9,6 +8,7 @@ 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 +37,9 @@ public interface StRequisitionMapper extends BaseMapper<StRequisition> {
 	 * @param queryWrapper 查询条件
 	 * @return List<StRequisitionExcel>
 	 */
-	List<StRequisitionExcel> exportStRequisition(@Param("ew") Wrapper<StRequisition> queryWrapper);
+//	List<StRequisitionExcel> exportStRequisition(@Param("ew") Wrapper<StRequisition> queryWrapper);

 	List<StRequisitionVO> selectWaitPushPage(IPage<StRequisitionVO> page, StRequisitionVO stRequisition);
+
+	List<StRequisitionExcel> exportStRequisition(@Param("stRequisition") Map<String, Object> stRequisition);
 }
--- 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 @@
    </select>

    <select id="exportStRequisition" resultType="org.springblade.wms.excel.StRequisitionExcel">
-        SELECT * FROM ST_REQUISITION ${ew.customSqlSegment}
+        SELECT
+        r.*, -- 采购申请单所有字段
+        g.id AS goodsId, -- 关联物料表，查询goodsId（物料表主键）
+        g.goods_name
+        FROM st_requisition r
+        -- 左关联物料表：采购申请单prtno = 物料表goodsCode，过滤未删除物料
+        LEFT JOIN st_goods g
+        ON r.prtno = g.goods_code
+        AND g.is_deleted = 0
+        WHERE 1=1
+        <!-- 固定过滤：curStatus = 已打印待入库（使用实体常量） -->
+        AND r.cur_status = ${@org.springblade.wms.pojo.entity.StRequisition@CUR_STATUS_PRINT}
+        <if test="stRequisition.prtno != null and stRequisition.prtno != ''">
+            AND r.prtno LIKE '%' || #{stRequisition.prtno} || '%'
+        </if>
+        <if test="stRequisition.prtdesc != null and stRequisition.prtdesc != ''">
+            AND r.prtdesc LIKE '%' || #{stRequisition.prtdesc} || '%'
+        </if>
+        <!-- 采购申请单自身逻辑删除过滤 -->
+        AND r.is_deleted = 0
+        <!-- 排序：默认按录入时间降序 -->
+        ORDER BY r.enrtydate DESC
    </select>

 </mapper>
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStErpWarehouseTransferService.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStErpWarehouseTransferService.java
@ -1,6 +1,5 @@
 package org.springblade.wms.service;

-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.secure.BladeUser;
@ -9,6 +8,7 @@ import org.springblade.wms.pojo.entity.StErpWarehouseTransfer;
 import org.springblade.wms.pojo.vo.StErpWarehouseTransferVO;

 import java.util.List;
+import java.util.Map;

 /**
 * @version 1.0
@ -36,10 +36,12 @@ public interface IStErpWarehouseTransferService extends BaseService<StErpWarehou
 	 * @param queryWrapper 查询条件
 	 * @return List<StErpWarehouseTransferExcel>
 	 */
-	List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(Wrapper<StErpWarehouseTransfer> queryWrapper);
+//	List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(Wrapper<StErpWarehouseTransfer> queryWrapper);

 	void transferReceipt(Long shId, Long slId, Long ewtId, Double putQuantity, BladeUser user);

 	void transferReceiptBatch(BladeUser user);
+
+	List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(Map<String, Object> stErpWarehouseTransfer);
 }

--- 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<StRequisition> {
 	 * @param queryWrapper 查询条件
 	 * @return List<StRequisitionExcel>
 	 */
-	List<StRequisitionExcel> exportStRequisition(Wrapper<StRequisition> queryWrapper);
+//	List<StRequisitionExcel> exportStRequisition(Wrapper<StRequisition> queryWrapper);

 	List<StRequisitionExcel> assembleExportData(QueryWrapper<StRequisition> queryWrapper, String printType);

@ -52,5 +51,7 @@ public interface IStRequisitionService extends BaseService<StRequisition> {
 	void pushWarehose(List<StRequisitionDTO> list, BladeUser user);

 	Map<String, Object> getBarCode(Long srId);
+
+	List<StRequisitionExcel> exportStRequisition(Map<String, Object> stRequisition);
 }

--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StErpWarehouseTransferServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StErpWarehouseTransferServiceImpl.java
@ -2,7 +2,6 @@ package org.springblade.wms.service.impl;

 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
-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;
@ -24,6 +23,7 @@ import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;

 /**
 * @version 1.0
@ -186,11 +186,8 @@ public class StErpWarehouseTransferServiceImpl extends BaseServiceImpl<StErpWare
 	}

 	@Override
-	public List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(Wrapper<StErpWarehouseTransfer> queryWrapper) {
-		List<StErpWarehouseTransferExcel> stErpWarehouseTransferList = baseMapper.exportStErpWarehouseTransfer(queryWrapper);
-		//stErpWarehouseTransferList.forEach(stErpWarehouseTransfer -> {
-		//	stErpWarehouseTransfer.setTypeName(DictCache.getValue(DictEnum.YES_NO, StErpWarehouseTransfer.getType()));
-		//});
+	public List<StErpWarehouseTransferExcel> exportStErpWarehouseTransfer(Map<String, Object> stErpWarehouseTransfer) {
+		List<StErpWarehouseTransferExcel> stErpWarehouseTransferList = baseMapper.exportStErpWarehouseTransfer(stErpWarehouseTransfer);
 		return stErpWarehouseTransferList;
 	}

--- 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<StRequisitionMappe
 		for (StRequisition rbStRequisition : requisitionList) {
 			StRequisitionExcel excelVO = new StRequisitionExcel();
 			// 基础字段映射（原逻辑保留）
-			excelVO.setBrCode(rbStRequisition.getInvadjCode());
-			excelVO.setInviefdat(rbStRequisition.getInviefdat());
-			excelVO.setPrtno(rbStRequisition.getPrtno());
-			excelVO.setWarno(rbStRequisition.getWarno());
-			excelVO.setWarlocno(rbStRequisition.getWarlocno());
-			excelVO.setRemark(rbStRequisition.getRemark());
-			excelVO.setWarctlr(rbStRequisition.getWarctlr());
-			excelVO.setEnrtydate(rbStRequisition.getEnrtydate());
-			excelVO.setPrintDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
-			excelVO.setSplyName(rbStRequisition.getSplyName());
-			excelVO.setPrtlotno(rbStRequisition.getPrtno());
-			excelVO.setValiddat(rbStRequisition.getValiddat());
-			excelVO.setPrtdesc(rbStRequisition.getPrtdesc());
-			excelVO.setPrtinfo(rbStRequisition.getPrtinfo());
-			excelVO.setPrtum(rbStRequisition.getPrtum());
-			excelVO.setInvysqty(rbStRequisition.getInvysqty());
-			excelVO.setQutno(rbStRequisition.getQutno());
-			excelVO.setGoodsName(rbStRequisition.getPrtdesc());
-			excelVO.setPrtrepno(rbStRequisition.getPrtrepno());
-			excelVO.setExtraBill(rbStRequisition.getBuyCode());
+//			excelVO.setBrCode(rbStRequisition.getInvadjCode());
+//			excelVO.setInviefdat(rbStRequisition.getInviefdat());
+//			excelVO.setPrtno(rbStRequisition.getPrtno());
+//			excelVO.setWarno(rbStRequisition.getWarno());
+//			excelVO.setWarlocno(rbStRequisition.getWarlocno());
+//			excelVO.setRemark(rbStRequisition.getRemark());
+//			excelVO.setWarctlr(rbStRequisition.getWarctlr());
+//			excelVO.setEnrtydate(rbStRequisition.getEnrtydate());
+//			excelVO.setPrintDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
+//			excelVO.setSplyName(rbStRequisition.getSplyName());
+//			excelVO.setPrtlotno(rbStRequisition.getPrtno());
+//			excelVO.setValiddat(rbStRequisition.getValiddat());
+//			excelVO.setPrtdesc(rbStRequisition.getPrtdesc());
+//			excelVO.setPrtinfo(rbStRequisition.getPrtinfo());
+//			excelVO.setPrtum(rbStRequisition.getPrtum());
+//			excelVO.setInvysqty(rbStRequisition.getInvysqty());
+//			excelVO.setQutno(rbStRequisition.getQutno());
+//			excelVO.setGoodsName(rbStRequisition.getPrtdesc());
+//			excelVO.setPrtrepno(rbStRequisition.getPrtrepno());
+//			excelVO.setExtraBill(rbStRequisition.getBuyCode());

 			// ========== 替换StringUtil.isNotBlank（纯JDK实现） ==========
 //			JSONArray detailList = new JSONArray();
@ -316,11 +315,8 @@ public class StRequisitionServiceImpl extends BaseServiceImpl<StRequisitionMappe
 	}

 	@Override
-	public List<StRequisitionExcel> exportStRequisition(Wrapper<StRequisition> queryWrapper) {
-		List<StRequisitionExcel> stRequisitionList = baseMapper.exportStRequisition(queryWrapper);
-		//stRequisitionList.forEach(stRequisition -> {
-		//	stRequisition.setTypeName(DictCache.getValue(DictEnum.YES_NO, StRequisition.getType()));
-		//});
+	public List<StRequisitionExcel> exportStRequisition(Map<String, Object> stRequisition) {
+		List<StRequisitionExcel> stRequisitionList = baseMapper.exportStRequisition(stRequisition);
 		return stRequisitionList;
 	}