diff --git a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java
index 3911e740..791f930f 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java
@@ -69,6 +69,14 @@ public class CrmOrderItem extends BaseEntity {
* 重量
*/
private BigDecimal weight;
+ /**
+ * 宽度公差
+ */
+ private BigDecimal widthTolerance;
+ /**
+ * 厚度公差
+ */
+ private BigDecimal thicknessTolerance;
/**
* 合同定价
*/
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java
index ee08d021..8720724f 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java
@@ -78,6 +78,16 @@ public class CrmOrderItemBo extends BaseEntity {
*/
private BigDecimal weight;
+ /**
+ * 宽度公差
+ */
+ private BigDecimal widthTolerance;
+
+ /**
+ * 厚度公差
+ */
+ private BigDecimal thicknessTolerance;
+
/**
* 合同定价
*/
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java
index 4efd8b12..a0f54694 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java
@@ -95,6 +95,18 @@ public class CrmOrderItemVo {
@ExcelProperty(value = "重量")
private BigDecimal weight;
+ /**
+ * 宽度公差
+ */
+ @ExcelProperty(value = "宽度公差")
+ private BigDecimal widthTolerance;
+
+ /**
+ * 厚度公差
+ */
+ @ExcelProperty(value = "厚度公差")
+ private BigDecimal thicknessTolerance;
+
/**
* 合同定价
*/
diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java
index cee3853a..1aeb4339 100644
--- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java
+++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java
@@ -71,6 +71,8 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), CrmOrderItem::getMaterial, bo.getMaterial());
lqw.eq(StringUtils.isNotBlank(bo.getGrade()), CrmOrderItem::getGrade, bo.getGrade());
lqw.eq(bo.getWeight() != null, CrmOrderItem::getWeight, bo.getWeight());
+ lqw.eq(bo.getWidthTolerance() != null, CrmOrderItem::getWidthTolerance, bo.getWidthTolerance());
+ lqw.eq(bo.getThicknessTolerance() != null, CrmOrderItem::getThicknessTolerance, bo.getThicknessTolerance());
lqw.eq(bo.getContractPrice() != null, CrmOrderItem::getContractPrice, bo.getContractPrice());
lqw.eq(StringUtils.isNotBlank(bo.getCustomizer()), CrmOrderItem::getCustomizer, bo.getCustomizer());
lqw.eq(StringUtils.isNotBlank(bo.getShipper()), CrmOrderItem::getShipper, bo.getShipper());
diff --git a/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml b/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml
index cab90b42..dfeb51b2 100644
--- a/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml
+++ b/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml
@@ -17,6 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -42,6 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
material,
grade,
weight,
+ width_tolerance,
+ thickness_tolerance,
contract_price,
customizer,
shipper,