feat(WmsMaterialCoil): 添加下一库区名称字段支持

- 在 WmsMaterialCoilVo 中新增 nextWarehouseName 字段
- 更新 WmsMaterialCoilMapper.xml 查询语句,关联下一库区表获取库区名称
- 为 nextWarehouseName 字段添加 Excel 导出注解配置
- 完善实体类注释文档
This commit is contained in:
2026-02-06 13:20:39 +08:00
parent cdf54bd3c5
commit 13833aab4d
2 changed files with 7 additions and 0 deletions

View File

@@ -164,6 +164,11 @@ public class WmsMaterialCoilVo extends BaseEntity {
@ExcelProperty(value = "库区名称") @ExcelProperty(value = "库区名称")
private String warehouseName; private String warehouseName;
/**
* 下一库区名称
*/
private String nextWarehouseName;
/** /**
* 钢卷数量(用于统计查询) * 钢卷数量(用于统计查询)
*/ */

View File

@@ -105,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.exclusive_status, mc.exclusive_status,
su.nick_name AS saleName, su.nick_name AS saleName,
w.warehouse_name AS warehouseName, w.warehouse_name AS warehouseName,
nw.warehouse_name AS nextWarehouseName,
aw.actual_warehouse_name AS actualWarehouseName, aw.actual_warehouse_name AS actualWarehouseName,
CASE WHEN mc.item_type = 'raw_material' THEN rm.specification CASE WHEN mc.item_type = 'raw_material' THEN rm.specification
WHEN mc.item_type = 'product' THEN p.specification WHEN mc.item_type = 'product' THEN p.specification
@@ -136,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
COALESCE(ca.abnormal_count, 0) AS abnormalCount COALESCE(ca.abnormal_count, 0) AS abnormalCount
FROM wms_material_coil mc FROM wms_material_coil mc
LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
LEFT JOIN wms_warehouse nw ON mc.next_warehouse_id = nw.warehouse_id
LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id
LEFT JOIN sys_user su ON mc.sale_id = su.user_id LEFT JOIN sys_user su ON mc.sale_id = su.user_id
LEFT JOIN wms_raw_material rm ON mc.item_type = 'raw_material' AND mc.item_id = rm.raw_material_id LEFT JOIN wms_raw_material rm ON mc.item_type = 'raw_material' AND mc.item_id = rm.raw_material_id