From 230b18eee69285b5ccefdd853ed1072d0d3e7e16 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 26 Jun 2026 11:00:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E6=9D=90?= =?UTF-8?q?=E6=96=99=E5=8D=B7=E5=8E=9A=E5=BA=A6=E5=B7=AE=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsMaterialCoilAllExportVo中新增厚度差字段 - 在导出列配置中添加厚度差映射 - 实现厚度差计算逻辑：理论厚度减去实际厚度 - 添加数字格式异常处理避免程序崩溃 - 支持厚度差数据的Excel导出功能 --- .../com/klp/controller/WmsMaterialCoilController.java | 1 + .../com/klp/domain/vo/WmsMaterialCoilAllExportVo.java | 3 +++ .../klp/service/impl/WmsMaterialCoilServiceImpl.java | 11 +++++++++++ 3 files changed, 15 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java index 985f9e703..21f811fe2 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java @@ -211,6 +211,7 @@ public class WmsMaterialCoilController extends BaseController { columns.put("theoreticalLength", "理论长度"); columns.put("rawMaterialThickness", "原料厚度"); columns.put("chromePlateCoilNo", "镀铬卷号"); + columns.put("thicknessDifference", "厚度差"); return R.ok(columns); } 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 228f75a0e..cc526a6ea 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 @@ -245,4 +245,7 @@ public class WmsMaterialCoilAllExportVo { @ExcelProperty(value = "实测宽度") private String actualWidth; + + @ExcelProperty(value = "厚度差") + private String thicknessDifference; } 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 962a57abb..889859d97 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 @@ -3807,6 +3807,17 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { String isRelatedText = vo.getIsRelatedToOrder() == 0 ? "否" : "是"; vo.setIsRelatedToOrderText(isRelatedText); } + + // 计算厚度差：理论厚度 - 实际厚度 + if (vo.getTheoreticalThickness() != null && vo.getActualThickness() != null) { + try { + BigDecimal theory = new BigDecimal(vo.getTheoreticalThickness()); + BigDecimal actual = new BigDecimal(vo.getActualThickness()); + vo.setThicknessDifference(theory.subtract(actual).toString()); + } catch (NumberFormatException ignored) { + // 解析失败则留空 + } + } } } From 40c2f8358940645f42c8338fedacf2d3c2f64008 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 26 Jun 2026 11:05:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?docs(domain):=20=E6=9B=B4=E6=96=B0=E9=95=80?= =?UTF-8?q?=E9=93=AC=E5=8D=B7=E5=8F=B7=E5=AD=97=E6=AE=B5=E4=B8=BA=E5=B7=A5?= =?UTF-8?q?=E5=BA=8F=E5=8D=B7=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 WmsMaterialCoil 实体类中的字段注释 - 更新 WmsMaterialCoilAllExportVo 导出视图对象的 Excel 属性标注 - 修改 WmsMaterialCoilBo 业务对象的字段注释 - 更新控制器中列名映射的中文描述 - 修改 WmsMaterialCoilExportVo 导出视图对象的注释和 Excel 属性 - 更新 MyBatis 映射文件中的 SQL 注释 - 修改服务实现类中的查询条件注释 - 更新 WmsMaterialCoilVo 视图对象的字段注释 --- .../java/com/klp/controller/WmsMaterialCoilController.java | 2 +- klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java | 2 +- .../src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java | 2 +- .../java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java | 2 +- .../main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java | 4 ++-- .../src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java | 2 +- .../java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 2 +- .../src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java index 21f811fe2..1cb96abc3 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java @@ -210,7 +210,7 @@ public class WmsMaterialCoilController extends BaseController { columns.put("scheduleThickness", "排产厚度"); columns.put("theoreticalLength", "理论长度"); columns.put("rawMaterialThickness", "原料厚度"); - columns.put("chromePlateCoilNo", "镀铬卷号"); + columns.put("chromePlateCoilNo", "工序卷号"); columns.put("thicknessDifference", "厚度差"); return R.ok(columns); } 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 6a2c3a902..bf0a72fbc 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java @@ -230,7 +230,7 @@ public class WmsMaterialCoil extends BaseEntity { private BigDecimal theoreticalLength; /** - * 镀铬卷号 + * 工序卷号 */ private String chromePlateCoilNo; 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 8f9283aad..c35199ec8 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 @@ -408,7 +408,7 @@ public class WmsMaterialCoilBo extends BaseEntity { private BigDecimal theoreticalLength; /** - * 镀铬卷号 + * 工序卷号 */ private String chromePlateCoilNo; 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 cc526a6ea..4edff3767 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 @@ -237,7 +237,7 @@ public class WmsMaterialCoilAllExportVo { @ExcelProperty(value = "理论长度") private String theoreticalLength; - @ExcelProperty(value = "镀铬卷号") + @ExcelProperty(value = "工序卷号") private String chromePlateCoilNo; @ExcelProperty(value = "实测长度") 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 a50adcd8c..891fde048 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 @@ -229,9 +229,9 @@ public class WmsMaterialCoilExportVo { private BigDecimal theoreticalLength; /** - * 镀铬卷号 + * 工序卷号 */ - @ExcelProperty(value = "镀铬卷号") + @ExcelProperty(value = "工序卷号") private String chromePlateCoilNo; /** 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 790c121f6..87b367cf0 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 @@ -356,7 +356,7 @@ public class WmsMaterialCoilVo extends BaseEntity { private BigDecimal theoreticalLength; /** - * 镀铬卷号 + * 工序卷号 */ private String chromePlateCoilNo; 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 889859d97..408f70063 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 @@ -1057,7 +1057,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.eq(bo.getScheduleThickness() != null, "mc.schedule_thickness", bo.getScheduleThickness()); // 理论长度 qw.eq(bo.getTheoreticalLength() != null, "mc.theoretical_length", bo.getTheoreticalLength()); - // 镀铬卷号 + // 工序卷号 qw.like(StringUtils.isNotBlank(bo.getChromePlateCoilNo()), "mc.chrome_plate_coil_no", bo.getChromePlateCoilNo()); // 生产开始时间 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 daa1b12f6..9dc2d5306 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml @@ -521,7 +521,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mc.schedule_thickness AS scheduleThickness, -- 理论长度 mc.theoretical_length AS theoreticalLength, - -- 镀铬卷号 + -- 工序卷号 mc.chrome_plate_coil_no AS chromePlateCoilNo, -- 库存状态（中文显示） CASE