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) { + // 解析失败则留空 + } + } } }