diff --git a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
index c564360a..8df2fac3 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
@@ -132,6 +132,9 @@ public class WmsMaterialCoil extends BaseEntity {
//销售id
private Long saleId;
+ //销售人员姓名
+ private String saleName;
+
//新增长度字段
private BigDecimal length;
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
index afae1c0a..084f0719 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
@@ -223,6 +223,9 @@ public class WmsMaterialCoilBo extends BaseEntity {
//销售id
private Long saleId;
+ //销售人员姓名
+ private String saleName;
+
//新增长度字段
private BigDecimal length;
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java
index 21ecdc4f..d128b2f5 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java
@@ -195,4 +195,10 @@ public class WmsMaterialCoilAllExportVo {
@ExcelProperty(value = "是否与订单相关")
private String isRelatedToOrderText;
+
+ /**
+ * 销售人员
+ */
+ @ExcelProperty(value = "销售人员")
+ private String saleName;
}
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
index 64850a0f..b13cf1cf 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
@@ -195,4 +195,9 @@ public class WmsMaterialCoilExportVo {
*/
@ExcelProperty(value = "操作完成时间")
private Date actionCompleteTime;
+
+ /**
+ * 销售人员
+ */
+ private String saleName;
}
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
index f497e292..a914c0f5 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
@@ -474,5 +474,7 @@ public class WmsMaterialCoilVo extends BaseEntity {
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date actionCompleteTime;
+
+ private String saleNickName;
}
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index 5602c8bf..969276a4 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -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-"));
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
index 08c1a49a..6dd8e3a4 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
@@ -35,6 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -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 '已发货'