From 7e7f03e19ffc374d08efb3cbf8b62c6483a9ba24 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 26 Mar 2026 10:41:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(domain):=20=E6=B7=BB=E5=8A=A0=E6=9D=90?=
=?UTF-8?q?=E6=96=99=E5=8D=B7=E5=AE=9E=E6=B5=8B=E5=8E=9A=E5=BA=A6=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在WmsMaterialCoil实体类中新增actualThickness字段
- 在WmsMaterialCoilAllExportVo导出对象中添加厚度导出映射
- 在WmsMaterialCoilBo业务对象中增加厚度查询条件支持
- 在WmsMaterialCoilExportVo导出对象中补充厚度字段定义
- 更新WmsMaterialCoilMapper.xml映射文件中的厚度字段映射
- 在WmsMaterialCoilServiceImpl服务实现中加入厚度查询逻辑
- 在WmsMaterialCoilVo视图对象中添加厚度字段定义
---
klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java | 5 +++++
.../src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java | 5 +++++
.../java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java | 7 +++++++
.../java/com/klp/domain/vo/WmsMaterialCoilExportVo.java | 5 +++++
.../src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java | 5 +++++
.../com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 2 ++
.../main/resources/mapper/klp/WmsMaterialCoilMapper.xml | 5 +++++
7 files changed, 34 insertions(+)
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 8df2fac3..c747df13 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
@@ -174,6 +174,11 @@ public class WmsMaterialCoil extends BaseEntity {
*/
private BigDecimal actualWidth;
+ /**
+ * 实测厚度（单位：毫米）
+ */
+ private String actualThickness;
+
/**
* 生产开始时间
*/
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 382497c4..4c41cd0a 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
@@ -294,6 +294,11 @@ public class WmsMaterialCoilBo extends BaseEntity {
*/
private BigDecimal actualWidth;
+ /**
+ * 实测厚度（单位：毫米）
+ */
+ private String actualThickness;
+
/**
* 生产开始时间
*/
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 d128b2f5..d26020a4 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
@@ -201,4 +201,11 @@ public class WmsMaterialCoilAllExportVo {
*/
@ExcelProperty(value = "销售人员")
private String saleName;
+
+
+ /**
+ * 实测厚度（单位：毫米）
+ */
+ @ExcelProperty(value = "实测厚度")
+ private String actualThickness;
}
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 b13cf1cf..f7e9fe67 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
@@ -128,6 +128,11 @@ public class WmsMaterialCoilExportVo {
@ExcelProperty(value = "长度")
private BigDecimal length;
+ /**
+ * 实测厚度
+ */
+ private String actualThickness;
+
/**
* 材质
*/
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 69882d7e..683d1dd5 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
@@ -279,6 +279,11 @@ public class WmsMaterialCoilVo extends BaseEntity {
@ExcelProperty(value = "实测宽度")
private BigDecimal actualWidth;
+ /**
+ * 实测厚度（单位：毫米）
+ */
+ private String actualThickness;
+
/**
* 生产开始时间
*/
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 3c8b1144..0cd56817 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
@@ -508,6 +508,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
qw.eq(bo.getActualLength() != null, "mc.actual_length", bo.getActualLength());
// 实测宽度
qw.eq(bo.getActualWidth() != null, "mc.actual_width", bo.getActualWidth());
+ // 实测厚度
+ qw.eq(StringUtils.isNotBlank(bo.getActualThickness()), "mc.actual_thickness", bo.getActualThickness());
// 生产开始时间
qw.eq(bo.getProductionStartTime() != null, "mc.production_start_time", bo.getProductionStartTime());
// 生产结束时间
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
index 6dd8e3a4..f08d49c6 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -110,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.length,
mc.actual_length,
mc.actual_width,
+ mc.actual_thickness,
mc.production_start_time,
mc.production_end_time,
mc.production_duration,
@@ -207,6 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.length,
mc.actual_length,
mc.actual_width,
+ mc.actual_thickness,
mc.production_start_time,
mc.production_end_time,
mc.production_duration,
@@ -506,6 +509,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.net_weight AS netWeight,
-- 长度
mc.length AS length,
+ -- 实测厚度
+ mc.actual_thickness AS actualThickness,
-- 镀层种类
mc.coating_type AS coatingType,
-- 调制度