From 1ccd7a95b2b072b67f690dbfc862f559e1b8288c Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Thu, 25 Jun 2026 11:50:33 +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

---
 .../wms/controller/StAllotRecordController.java       |  5 +++--
 .../org/springblade/wms/excel/StAllotRecordExcel.java |  7 +++----
 .../springblade/wms/mapper/StAllotRecordMapper.java   |  2 +-
 .../springblade/wms/mapper/StAllotRecordMapper.xml    | 11 ++++++-----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StAllotRecordController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StAllotRecordController.java
index 0f8a7a15f..cb390a2f4 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StAllotRecordController.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StAllotRecordController.java
@@ -189,8 +189,9 @@ public class StAllotRecordController extends BladeController {
 		//}
 		//queryWrapper.lambda().eq(StAllotRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 //		List<StAllotRecordExcel> list = stAllotRecordService.exportStAllotRecord(queryWrapper);
-		if (stAllotRecord.get("curStatus") == null) {
-			stAllotRecord.put("curStatus", StAllotRecord.STATUS_OK);
+
+		if (bladeUser != null && bladeUser.getDeptId() != null) {
+			stAllotRecord.put("createDept", Long.valueOf(bladeUser.getDeptId()));
 		}
 		List<StAllotRecordExcel> list = stAllotRecordService.exportStAllotRecord(stAllotRecord);
 		ExcelUtil.export(response, "库位调拨记录表数据" + DateUtil.time(), "库位调拨记录表数据表", list, StAllotRecordExcel.class);
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StAllotRecordExcel.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StAllotRecordExcel.java
index 2cdb7add8..5668a7de1 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StAllotRecordExcel.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/excel/StAllotRecordExcel.java
@@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -44,19 +43,19 @@ public class StAllotRecordExcel implements Serializable {
 	 * 旧库房号
 	 */
 	@ColumnWidth(20)
-	@Schema(description = "旧库位号")
+	@ExcelProperty("旧库房号")
 	private String oldWarehouseName;
 	/**
 	 * 旧库位号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("旧库位号）")
+	@ExcelProperty("旧库位号")
 	private String oldLocation;
 	/**
 	 * 新库房号
 	 */
 	@ColumnWidth(20)
-	@Schema(description = "新库房号")
+	@ExcelProperty("新库房号")
 	private String newWarehouseName;
 	/**
 	 * 新库位号
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StAllotRecordMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StAllotRecordMapper.java
index d6b10018b..33f5bdce5 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StAllotRecordMapper.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StAllotRecordMapper.java
@@ -42,6 +42,6 @@ public interface StAllotRecordMapper extends BaseMapper<StAllotRecord> {
 
     IPage<StAllotRecordVO> selectAllotWithGoods(@Param("page") IPage<StAllotRecord> page, @Param("ew") QueryWrapper<StAllotRecord> wrapper);
 
-	List<StAllotRecordExcel> exportStAllotRecord(Map<String, Object> stAllotRecord);
+	List<StAllotRecordExcel> exportStAllotRecord(@Param("stAllotRecord") Map<String, Object> stAllotRecord);
 }
 
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StAllotRecordMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StAllotRecordMapper.xml
index e4fc58116..33a829615 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StAllotRecordMapper.xml
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StAllotRecordMapper.xml
@@ -101,11 +101,12 @@
         LEFT JOIN st_storage_location ol ON a.old_sl_id = ol.id
         LEFT JOIN st_storage_location nl ON a.new_sl_id = nl.id
         WHERE a.is_deleted = 0
-        <!-- 2. 调拨单状态：前端传了用传的，没传用默认值NEW_BUILT，必生效 -->
-        AND a.cur_status = #{param2.curStatus}
-        <!-- 3. 商品编码：可选条件，传了就过滤，没传不生效（模糊查询，业务常用） -->
-        <if test="param2.goodsCode != null and param2.goodsCode != ''">
-            AND g.goods_code = #{param2.goodsCode}
+        AND a.cur_status = 1
+        <if test="stAllotRecord.createDept != null and stAllotRecord.createDept != ''">
+            AND a.create_dept = #{stAllotRecord.createDept}
+        </if>
+        <if test="stAllotRecord.goodsCode != null and stAllotRecord.goodsCode != ''">
+            AND g.goods_code = #{stAllotRecord.goodsCode}
         </if>
         ORDER BY a.create_time DESC
     </select>