|
|
|
|
@ -259,7 +259,7 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if(StringUtils.isNotEmpty(plateGoodsCode) && isContains){ |
|
|
|
|
Double h1 = dsPart.getPlateThickness(); |
|
|
|
|
Double h1 = getPlateThicknessAsDouble(dsPart); |
|
|
|
|
Double h2 = dsPart.getPlateThicknessTwo(); |
|
|
|
|
Double s1 = dsPart.getArea(); |
|
|
|
|
Double s2 = dsPart.getAreaTwo(); |
|
|
|
|
@ -442,6 +442,17 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public Double getPlateThicknessAsDouble(DsPartEntity dsPart) { |
|
|
|
|
if (dsPart.getPlateThickness() == null || dsPart.getPlateThickness().trim().isEmpty()) { |
|
|
|
|
return 0.0; |
|
|
|
|
} |
|
|
|
|
try { |
|
|
|
|
return Double.valueOf(dsPart.getPlateThickness()); |
|
|
|
|
} catch (NumberFormatException e) { |
|
|
|
|
log.warn("厚度格式错误: {}", dsPart.getPlateThickness()); |
|
|
|
|
return 0.0; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|