feat(material): 添加销售人员信息功能

- 在 WmsMaterialCoil 实体中新增 saleName 字段
- 在导出 VO 类中添加销售人员导出映射
- 在 Bo 类中添加销售人员查询条件字段
- 更新 MyBatis 映射文件中的查询结果映射
- 实现销售人员姓名模糊查询功能
- 添加销售关联数据的查询逻辑
This commit is contained in:
2026-03-23 10:02:33 +08:00
parent dcff086f72
commit 080fe1dd0f
7 changed files with 33 additions and 2 deletions

View File

@@ -132,6 +132,9 @@ public class WmsMaterialCoil extends BaseEntity {
//销售id
private Long saleId;
//销售人员姓名
private String saleName;
//新增长度字段
private BigDecimal length;

View File

@@ -223,6 +223,9 @@ public class WmsMaterialCoilBo extends BaseEntity {
//销售id
private Long saleId;
//销售人员姓名
private String saleName;
//新增长度字段
private BigDecimal length;

View File

@@ -195,4 +195,10 @@ public class WmsMaterialCoilAllExportVo {
@ExcelProperty(value = "是否与订单相关")
private String isRelatedToOrderText;
/**
* 销售人员
*/
@ExcelProperty(value = "销售人员")
private String saleName;
}

View File

@@ -195,4 +195,9 @@ public class WmsMaterialCoilExportVo {
*/
@ExcelProperty(value = "操作完成时间")
private Date actionCompleteTime;
/**
* 销售人员
*/
private String saleName;
}

View File

@@ -474,5 +474,7 @@ public class WmsMaterialCoilVo extends BaseEntity {
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date actionCompleteTime;
private String saleNickName;
}

View File

@@ -518,6 +518,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
}
}
// 销售人员姓名模糊查询
if (bo.getSaleName() != null && !bo.getSaleName().isEmpty()) {
qw.like("su.nick_name", bo.getSaleName());
}
// 仅查询废品:质量状态为 D+、D、D-
if (Boolean.TRUE.equals(bo.getOnlyScrap())) {
qw.in("mc.quality_status", java.util.Arrays.asList("C+", "C", "C-", "D+", "D", "D-"));

View File

@@ -35,6 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="saleId" column="sale_id"/>
<result property="saleName" column="sale_name"/>
</resultMap>
<!-- 统计查询专用的ResultMap -->
@@ -117,7 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.business_purpose,
mc.is_related_to_order,
mc.exclusive_status,
su.nick_name AS saleName,
mc.sale_name AS saleName,
su.nick_name AS saleNickName,
w.warehouse_name AS warehouseName,
nw.warehouse_name AS nextWarehouseName,
aw.actual_warehouse_name AS actualWarehouseName,
@@ -213,7 +216,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.business_purpose,
mc.is_related_to_order,
mc.exclusive_status,
su.nick_name AS saleName,
mc.sale_name AS saleName,
su.nick_name AS saleNickName,
w.warehouse_name AS warehouseName,
nw.warehouse_name AS nextWarehouseName,
aw.actual_warehouse_name AS actualWarehouseName,
@@ -518,6 +522,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.quality_status AS qualityStatus,
-- 打包状态(直接展示原始值)
mc.packing_status AS packingStatus,
-- 销售
mc.sale_name AS saleName,
-- 库存状态(中文显示)
CASE
WHEN mc.status = 0 THEN '在库'
@@ -603,6 +609,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.packaging_requirement AS packagingRequirement,
mc.quality_status AS qualityStatus,
mc.packing_status AS packingStatus,
mc.sale_name AS saleName,
CASE
WHEN mc.status = 0 THEN '在库'
WHEN mc.status = 1 THEN '已发货'